JAXB parsing refactored