More work on file format. Added hashmap