Invoice refactoring for CBA