Added Entity class