Converted maps to new format