Refactoring XA2Util