Updated map to new format
Merge remote-tracking branch 'origin/development'