+ Preparation for integration with new planner