Added Base classes to objects in the map and base main function