Added validation to change-goal-command