Improve common planner.