[IMPROVEMENT] Take properties into account in Entity.equals()