Changes to goal_provider