replaced Unit.valueOf by BillingUnit.valueOf