model BaseModel refactoring