Added specific JAXB implementation back