Batch xml parsing refactoring
Improve EE integration