Added the map code