Updated map to new format