Added support for Map API (and map fragment for testing)
Added data classes
Extended some data classes