Adapt construction in different file formats