moved away from jaxb