Rework endorsement in various file formats