Add Google Maps and updated data model