Some optimisation in GoalService