Moved models into datamapper setup