Added JAXB code