enhanced wsdl and updated contract first classes