Moving to JAXB based parsing