Add in Entity class