Added the jaxb annotations.
Extracted the convert methods to Converter