Updated planner to support functionality needed for simply planning