entities classes change

change attributes/class according to Ezra's demands.