Worked on planner, Goal type is not present in this commit, need to merge for Planner to work properly