Improved naming, added BaseModel