More wrappers and JAXB hacks