Deal better with entities