Updated the map
Added ability to load json