Even more JAXB goodness