Refactoring of Billing Account, InstalledBase and Billing Installed Base