Updated Entity class