Changes to allow for passing planner options.