added BaseModel
Added map setter