Switch to models/ModelMixin everywhere