improved jaxb parsing