Added loading of map data via LayerMapping
- Model and settings updates