Changed object models. Added  and  classes