Changes for Billing Module