Updated most returns for BaseModel