Rework construction in different file formats