#44 New file format