Add decorrelation support in PlannerImpl