Manager renamed to Map. Added more depth to the Map class.