Moved models to data mapper setup