Small fix in Entity and Tree entity