moved models to maps