Added JAXB Module Support
Added JAXB Module Support
Merge