Added JAXB functionality