Rework issue in various file formats