moved BaseModel to core.
Added more methods