PlanBinding refactoring