Updated GoalModel