Changes to not use the BaseModel class