Include fixed wsdl definitions, some NPE protection in DataManager
and Harvester