Some Improvements adding Module JAXB Support