redesigned mappings format