Modified APS User and Billing Account classes