Billing system improvements

-->