had to add some getters in the Billing System (this is still messy)