Added support for JAXB