Added Goal Model and adapted GoalGetter accordingly