ADD - Billing services fix