Billing Management changes