Code cleanup: added model classes Map and GoogleMap