Added XCA and fixed JAXB generation