Changing the models to NOT extend from BaseModel.