Added JAXB support