refactored jaxb classes