Adding final state to goal
Adding GoalRecord aspect