Sugar: Switch from Guids to EntityIds