Planner service comments and minor modification