Tweaks on Entity Loading