Billing refactored