Use ```InvoiceAttributesWithBundleKeys``` where needed instead of adding the attributes here (```cba``` is ```credit```)..