Added functionality in Entity.