Added jaxb functionality