Updated map model to include nested model for map objects