Moved models into common