Added GameMap along with other minor classes