Updated map model and service to load all correct data