Implement new format for mappings file