Tweaks on the entities