Rework address in various file formats