Updated code to allow rdap xsd/jaxb objects to be regenerated
Some code improvements