Working on Entity class