Adjust construction in different file formats