Added BillingSystemFactory