More additions to GoalBuilder