More work on file format