BillingPlan refactoring