Refactoring; Added woodstox dependency