Added BaseModel 2.6