Changed format of mappings