Added improved converters for JAXB.