Issue #2325761: Changes needed now that goals are now entities in personalize module