Changed to just use BILL_TO_CUSTOMER instead of that and CLIENT roles