Adding JAXB support