Adapted new syntax file format