Several changes on file formats