diff --git a/esp/CMakeLists.txt b/esp/CMakeLists.txt
index c56ba6223e2..968aaa05e4e 100644
--- a/esp/CMakeLists.txt
+++ b/esp/CMakeLists.txt
@@ -30,6 +30,7 @@ HPCC_ADD_SUBDIRECTORY (test "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (tools "CLIENTTOOLS")
 HPCC_ADD_SUBDIRECTORY (xslt)
 HPCC_ADD_SUBDIRECTORY (esdllib)
+HPCC_ADD_SUBDIRECTORY (esdlscriptlib)
 HPCC_ADD_SUBDIRECTORY (applications)
 HPCC_ADD_SUBDIRECTORY (espcommon)
 if (LOGGING_SERVICE)
diff --git a/esp/bindings/http/platform/httpbinding.cpp b/esp/bindings/http/platform/httpbinding.cpp
index 82c2503881e..14de4699692 100644
--- a/esp/bindings/http/platform/httpbinding.cpp
+++ b/esp/bindings/http/platform/httpbinding.cpp
@@ -47,6 +47,7 @@
 #include "workunit.hpp"
 #include "cumulativetimer.hpp"
 #include <memory>
+#include "esdl_def_helper.hpp"
 
 #define FILE_UPLOAD     "FileUploadAccess"
 #define DEFAULT_HTTP_PORT 80
@@ -95,7 +96,7 @@ static IXmlSchema* createXmlSchema(const char* schema)
     XmlSchemaCreator creator = (XmlSchemaCreator)GetSharedProcedure(xmllib, "createXmlSchemaFromString");
     if (!creator)
         throw MakeStringException(-1,"load XmlSchema factory failed: createXmlSchemaFromString()");
-    
+
     return creator(schema);
 }
 
@@ -114,6 +115,17 @@ static void setBndCfgServiceType(IPropertyTree* tree, const char* procName, IPro
         bndCfg->setProp("@serviceType", srvType);
 }
 
+
+static void generateEsdlNamespace(IEspContext &context, CHttpRequest* request, const char *serv, const char *method, StringBuffer &ns, double version) {
+    ns.append("urn:hpccsystems:ws:");
+    if (serv && *serv)
+        ns.appendLower(strlen(serv), serv);
+
+    if (method && *method)
+        ns.append(":").append(method);
+    ns.toLowerCase();
+}
+
 class CEspCorsAllowedOrigin : public CInterfaceOf<IEspCorsAllowedOrigin>
 {
     StringBuffer hostPort;
@@ -288,7 +300,7 @@ IEspCorsHelper *createEspCorsHelper(IPropertyTree *cors)
 EspHttpBinding::EspHttpBinding(IPropertyTree* tree, const char *bindname, const char *procname)
 {
     Owned<IPropertyTree> proc_cfg = getProcessConfig(tree, procname);
-    m_viewConfig = proc_cfg ? proc_cfg->getPropBool("@httpConfigAccess") : false;   
+    m_viewConfig = proc_cfg ? proc_cfg->getPropBool("@httpConfigAccess") : false;
     m_formOptions = proc_cfg ? proc_cfg->getPropBool("@formOptionsAccess") : false;
     m_includeSoapTest = true;
     m_includeJsonTest = true;
@@ -346,7 +358,7 @@ EspHttpBinding::EspHttpBinding(IPropertyTree* tree, const char *bindname, const
                             m_subservices.setown(createPTreeFromXMLFile(ssfile, ipt_caseInsensitive));
                     }
                 }
-                
+
                 m_realm.set((realm) ? realm : "EspServices");
             }
         }
@@ -627,7 +639,7 @@ void EspHttpBinding::setUnrestrictedSSTypes()
 bool EspHttpBinding::isUnrestrictedSSType(sub_service ss) const
 {
     auto search = unrestrictedSSTypes.find(ss);
-    return (search != unrestrictedSSTypes.end()); 
+    return (search != unrestrictedSSTypes.end());
 }
 
 //Check whether the url is valid or not for redirect after authentication.
@@ -1145,19 +1157,19 @@ int EspHttpBinding::onGet(CHttpRequest* request, CHttpResponse* response)
     LogLevel level = getEspLogLevel(&context);
     if (level >= LogNormal)
         DBGLOG("EspHttpBinding::onGet");
-    
+
     response->setVersion(HTTP_VERSION);
     response->addHeader("Expires", "0");
 
     response->setStatus(HTTP_STATUS_OK);
-    
+
     sub_service sstype = sub_serv_unknown;
 
     StringBuffer pathEx;
     StringBuffer serviceName;
     StringBuffer methodName;
     StringBuffer paramStr;
-    
+
     request->getEspPathInfo(sstype, &pathEx, &serviceName, &methodName, false);
 
     // adjust version if necessary
@@ -1382,7 +1394,7 @@ static void filterXmlBySchema(StringBuffer& in, StringBuffer& schema, const char
 
     if (type)
         filterXmlBySchema(tree,type,name,out);
-    else 
+    else
     {
         const char* value = tree->queryProp(NULL);
         UWARNLOG("Unknown xml tag ignored: <%s>%s</%s>", name, value?value:"", name);
@@ -1410,7 +1422,7 @@ void EspHttpBinding::getXMLMessageTag(IEspContext& ctx, bool isRequest, const ch
 void EspHttpBinding::getSoapMessage(StringBuffer& soapmsg, IEspContext& ctx, CHttpRequest* request, const char *serv, const char *method)
 {
     StringBuffer reqName(serv);
-    reqName.append("Request");  
+    reqName.append("Request");
     Owned<IRpcMessage> msg = new CRpcMessage(reqName.str());
     msg->setContext(&ctx);
 
@@ -1423,7 +1435,7 @@ void EspHttpBinding::getSoapMessage(StringBuffer& soapmsg, IEspContext& ctx, CHt
     getSchema(schema,ctx,request,serv,method,false);
     getXMLMessageTag(ctx, true, method, tag);
     filterXmlBySchema(req,schema,tag.str(),filtered);
-    
+
     StringBuffer ns;
     soapmsg.appendf(
         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -1530,7 +1542,7 @@ static void filterXmlBySchema(StringBuffer& in, StringBuffer& schema, StringBuff
 
     if (type)
         filterXmlBySchema(tree,type,name,out,indent);
-    else 
+    else
     {
         const char* value = tree->queryProp(NULL);
         DBGLOG("Unknown xml tag ignored: <%s>%s</%s>", name, value?value:"", name);
@@ -1552,7 +1564,7 @@ void EspHttpBinding::getSoapMessage(StringBuffer& soapmsg, IEspContext& ctx, CHt
     getSchema(schema,ctx,request,serv,method,false);
     //DBGLOG("Schema: %s", schema.str());
     filterXmlBySchema(req,schema,filtered,2);
-    
+
     soapmsg.appendf(
         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
         "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""
@@ -1568,7 +1580,7 @@ void EspHttpBinding::getSoapMessage(StringBuffer& soapmsg, IEspContext& ctx, CHt
 
 
 int EspHttpBinding::onGetSoapBuilder(IEspContext &context, CHttpRequest* request, CHttpResponse* response,  const char *serv, const char *method)
-{   
+{
     StringBuffer soapmsg, serviceQName, methodQName;
 
     if (!qualifyServiceName(context, serv, method, serviceQName, &methodQName)
@@ -1576,17 +1588,17 @@ int EspHttpBinding::onGetSoapBuilder(IEspContext &context, CHttpRequest* request
         throw createEspHttpException(HTTP_STATUS_BAD_REQUEST_CODE, "Bad Request", HTTP_STATUS_BAD_REQUEST);
 
     getSoapMessage(soapmsg,context,request,serviceQName,methodQName);
-    
+
     //put all URL parameters into dest
-    
-    StringBuffer params;    
+
+    StringBuffer params;
     const char* excludes[] = {"soap_builder_",NULL};
-    
+
     getEspUrlParams(context,params,excludes);
 
-    VStringBuffer dest("%s/%s?%s", serviceQName.str(), methodQName.str(), params.str()); 
+    VStringBuffer dest("%s/%s?%s", serviceQName.str(), methodQName.str(), params.str());
 
-    VStringBuffer header("SOAPAction: \"%s\"\n", dest.str()); 
+    VStringBuffer header("SOAPAction: \"%s\"\n", dest.str());
     header.append("Content-Type: text/xml; charset=UTF-8");
 
     IXslProcessor* xslp = getXmlLibXslProcessor();
@@ -1616,7 +1628,7 @@ int EspHttpBinding::onGetSoapBuilder(IEspContext &context, CHttpRequest* request
     }
 
     StringBuffer page;
-    xform->transform(page);     
+    xform->transform(page);
 
     response->setContent(page);
     response->setContentType("text/html; charset=UTF-8");
@@ -1755,24 +1767,24 @@ int EspHttpBinding::onGetIframe(IEspContext &context, CHttpRequest* request, CHt
     if(title.length() > 0)
         content.appendf("<title>%s</title>", title.str());
     content.append("</head>");
-    
+
     content.append("<frameset rows=\"35,*\" FRAMEPADDING=\"0\" PADDING=\"0\" SPACING=\"0\" FRAMEBORDER=\"0\">");
     content.appendf("<frame src=\"itext?text=%s\" name=\"ititle\" target=\"imain\" scrolling=\"no\"/>", title.str());
-    
-    //content.appendf("<frame name=\"imain\" target=\"main\" src=\"../%s?%s\" scrolling=\"auto\" frameborder=\"0\" noresize=\"noresize\"/>", path, request->queryParamStr());   
+
+    //content.appendf("<frame name=\"imain\" target=\"main\" src=\"../%s?%s\" scrolling=\"auto\" frameborder=\"0\" noresize=\"noresize\"/>", path, request->queryParamStr());
     StringBuffer inner;
     request->getParameter("inner", inner);
     StringBuffer plainText;
     request->getParameter("PlainText", plainText);
     if (plainText.length() > 0)
         inner.appendf("&PlainText=%s", plainText.str());
-            
+
     ESPLOG(LogNormal,"Inner: %s", inner.str());
     ESPLOG(LogNormal,"Param: %s", request->queryParamStr());
     content.appendf("<frame name=\"imain\" target=\"main\" src=\"%s\" scrolling=\"auto\" frameborder=\"0\" noresize=\"noresize\"/>", inner.str());
     content.append("</frameset>");
     content.append("</body></html>");
-    
+
     response->setContent(content.length(), content.str());
     response->setContentType("text/html");
     response->send();
@@ -1823,7 +1835,7 @@ int EspHttpBinding::onGetVersion(IEspContext &context, CHttpRequest* request, CH
     StringBuffer srvQName;
     qualifyServiceName(context, service, NULL, srvQName, NULL);
     verxml.appendf("<VersionInfo><Service>%s</Service><Version>%.3f</Version></VersionInfo>", srvQName.str(), m_wsdlVer);
-    
+
     response->setContent(verxml.str());
     response->setContentType(HTTP_TYPE_APPLICATION_XML_UTF8);
     response->setStatus(HTTP_STATUS_OK);
@@ -1831,17 +1843,85 @@ int EspHttpBinding::onGetVersion(IEspContext &context, CHttpRequest* request, CH
     return 0;
 }
 
+void getServiceSchema(const char *serviceQName, const char *methodQName, double version, const char *nstr,
+                      const StringBuffer &xmlFilename,  Owned<IProperties> &params, EsdlXslTypeId EsdlXslType,
+                      IProperties *opts, StringBuffer &schema)
+{
+    Owned<IEsdlDefinition> esdlDef = createEsdlDefinition(nullptr, nullptr);
+    Owned<IEsdlDefinitionHelper> defHelper = createEsdlDefinitionHelper();
+
+    std::string xmlFilePath(getCFD());
+    xmlFilePath.append("esdl_files").append(PATHSEPSTR).append(xmlFilename.str());
+    esdlDef->addDefinitionsFromFile(xmlFilePath.c_str());
+    unsigned optFlags{DEPFLAG_COLLAPSE|DEPFLAG_ARRAYOF};
+    Owned<IEsdlDefObjectIterator> structs = esdlDef->getDependencies(serviceQName, methodQName, ";", version, opts, optFlags );
+
+    StringBuffer xlstFile(getCFD());
+    xlstFile.append("xslt").append(PATHSEPSTR).append("esp_service_xml2xsd.xslt");
+
+    defHelper->loadTransform(xlstFile, params, EsdlXslType);
+    defHelper->toWSDL(*structs, schema, EsdlXslType, version, opts, nstr, optFlags);
+}
+
+
 int EspHttpBinding::onGetXsd(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method)
 {
-    return getWsdlOrXsd(context,request,response,service,method,false);
+    return getServiceWsdlOrXsd(context, request, response, service, method, false);
 }
 
 int EspHttpBinding::onGetWsdl(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method)
 {
-    return getWsdlOrXsd(context,request,response,service,method,true);
+    return getServiceWsdlOrXsd(context, request, response, service, method, true);
 }
 
-bool EspHttpBinding::getSchema(StringBuffer& schema, IEspContext &ctx, CHttpRequest* req, const char *service, const char *method, bool standalone) 
+int EspHttpBinding::getServiceWsdlOrXsd(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method, bool isWsdl)
+{
+    StringBuffer serviceQName;
+    StringBuffer methodQName;
+
+    if (!qualifyServiceName(context, service, method, serviceQName, &methodQName))
+        return onGetNotFound(context, request,  response, service);
+
+    Owned<IProperties> params;
+    params.set(createProperties());
+
+    double version = getVersion(context);
+    params->setProp("version", StringBuffer("'").appendf("%g", version).append("'"));
+
+    StringBuffer nstr;
+    generateEsdlNamespace(context, request, serviceQName.str(), methodQName.str(), nstr, version);
+    params->setProp("tnsParam", StringBuffer("'").append(nstr).append("'").str());
+
+    if (isWsdl)
+    {
+        params->setProp( "create_wsdl", "true()" );
+        StringBuffer location(m_wsdlAddress.str());
+        if (request->queryParameters()->hasProp("wsdl_destination_path"))
+            location.append(request->queryParameters()->queryProp("wsdl_destination_path"));
+        else
+            location.append('/').append(serviceQName.str()).appendf("?ver_=%g", version);
+        params->setProp("location", StringBuffer("'").append(location).append("'").str());
+    }
+
+    StringBuffer xmlFilename;
+    if (!getXmlFilename(xmlFilename))
+    {
+        throw MakeStringException(-1, "Unable to get service XML filename");
+    }
+
+    StringBuffer schema;
+    getServiceSchema(serviceQName.str(), methodQName.str(), version, nstr.str(), xmlFilename,
+                     params, isWsdl ? EsdlXslToWsdl : EsdlXslToXsd, context.queryRequestParameters(), schema);
+
+    response->setContent(schema.length(), schema.str());
+    response->setContentType(HTTP_TYPE_APPLICATION_XML_UTF8);
+    response->setStatus(HTTP_STATUS_OK);
+    response->send();
+    return 0;
+}
+
+
+bool EspHttpBinding::getSchema(StringBuffer& schema, IEspContext &ctx, CHttpRequest* req, const char *service, const char *method, bool standalone)
 {
     StringBuffer serviceQName;
     StringBuffer methodQName;
@@ -1870,10 +1950,10 @@ bool EspHttpBinding::getSchema(StringBuffer& schema, IEspContext &ctx, CHttpRequ
     ForEach(*nsiter)
     {
         IPropertyTree &ns = nsiter->query();
-        if (ns.hasProp("@import"))  
+        if (ns.hasProp("@import"))
             schema.appendf("<xsd:import namespace=\"%s\" schemaLocation=\"%s\"/>", ns.queryProp("@ns"), ns.queryProp("@location"));
     }
-    
+
 
     schema.append(
         "<xsd:complexType name=\"EspException\">"
@@ -1895,7 +1975,7 @@ bool EspHttpBinding::getSchema(StringBuffer& schema, IEspContext &ctx, CHttpRequ
 
     if (ctx.queryOptions()&ESPCTX_WSDL_EXT)
     {
-        schema.append(          
+        schema.append(
             "<xsd:complexType name=\"EspSecurityInfo\">"
                 "<xsd:all>"
                     "<xsd:element name=\"UsernameToken\" minOccurs=\"0\">"
@@ -1919,91 +1999,13 @@ bool EspHttpBinding::getSchema(StringBuffer& schema, IEspContext &ctx, CHttpRequ
         );
     }
 
-    bool mda=(req->queryParameters()->getPropInt("mda")!=0);
+    bool mda = (req->queryParameters()->getPropInt("mda") != 0);
     getXsdDefinition(ctx, req, schema, sqName, mqName, mda);
-
     schema.append("<xsd:element name=\"string\" nillable=\"true\" type=\"xsd:string\" />\n");
     schema.append("</xsd:schema>");
-
     return true;
 }
 
-int EspHttpBinding::getWsdlOrXsd(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method, bool isWsdl)
-{
-    bool mda=(request->queryParameters()->getPropInt("mda")!=0);
-    try
-    {
-        StringBuffer serviceQName;
-        StringBuffer methodQName;
-
-        if (!qualifyServiceName(context, service, method, serviceQName, &methodQName))
-        {
-            return onGetNotFound(context, request,  response, service);
-        }
-        else
-        {
-            const char *sqName = serviceQName.str();
-            const char *mqName = methodQName.str();
-            StringBuffer ns;
-            generateNamespace(context, request, serviceQName.str(), methodQName.str(), ns);
-
-            StringBuffer content("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            if (context.queryRequestParameters()->hasProp("display"))
-                content.append("<?xml-stylesheet type=\"text/xsl\" href=\"/esp/xslt/xmlformatter.xsl\"?>");
-            else if (isWsdl && context.queryRequestParameters()->hasProp("wsdlviewer"))
-                content.append("<?xml-stylesheet type=\"text/xsl\" href=\"/esp/xslt/wsdl-viewer.xsl\"?>");
-            if (isWsdl)
-            {
-                content.appendf("<definitions xmlns=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                    " xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\" xmlns:tns=\"%s\""
-                    " targetNamespace=\"%s\">", ns.str(), ns.str());
-                content.append("<types>");
-            }
-
-            getSchema(content,context,request,service,method,!isWsdl);
-
-            if (isWsdl)
-            {
-                content.append("</types>");
-
-                getWsdlMessages(context, request, content, sqName, mqName, mda);
-                getWsdlPorts(context, request, content, sqName, mqName, mda);
-                getWsdlBindings(context, request, content, sqName, mqName, mda);
-                
-                StringBuffer location(m_wsdlAddress.str());
-                if (request->queryParameters()->hasProp("wsdl_destination_path"))
-                    location.append(request->queryParameters()->queryProp("wsdl_destination_path"));
-                else
-                    location.append('/').append(sqName).appendf("?ver_=%g", context.getClientVersion());
-                
-                if (request->queryParameters()->hasProp("encode_results"))
-                {
-                    const char *encval = request->queryParameters()->queryProp("encode_results");
-                    location.append("&amp;").appendf("encode_=%s", (encval && *encval) ? encval : "1");
-                }
-
-                content.appendf("<service name=\"%s\">", sqName);
-                content.appendf("<port name=\"%sServiceSoap\" binding=\"tns:%sServiceSoap\">", sqName, sqName);
-                content.appendf("<soap:address location=\"%s\"/>", location.str());
-                content.append("</port>");
-                content.append("</service>");
-                content.append("</definitions>");
-            }
-
-            response->setContent(content.length(), content.str());
-            response->setContentType(HTTP_TYPE_APPLICATION_XML_UTF8);
-            response->setStatus(HTTP_STATUS_OK);
-        }
-    }
-    catch (IException *e)
-    {
-        return onGetException(context, request, response, *e);
-    }
-
-    response->send();
-    return 0;
-}
-
 static void genSampleXml(StringStack& parent, IXmlType* type, StringBuffer& out, const char* tag, const char* ns=NULL)
 {
     assertex(type!=NULL);
@@ -2014,7 +2016,7 @@ static void genSampleXml(StringStack& parent, IXmlType* type, StringBuffer& out,
     {
         if (typeName && std::find(parent.begin(),parent.end(),typeName) != parent.end())
             return; // recursive
-        
+
         out.appendf("<%s", tag);
         if (ns)
             out.append(' ').append(ns);
@@ -2028,9 +2030,9 @@ static void genSampleXml(StringStack& parent, IXmlType* type, StringBuffer& out,
         out.append('>');
         if (typeName)
             parent.push_back(typeName);
-        
+
         int flds = type->getFieldCount();
-        
+
         switch (type->getSubType())
         {
         case SubType_Complex_SimpleContent:
@@ -2045,7 +2047,7 @@ static void genSampleXml(StringStack& parent, IXmlType* type, StringBuffer& out,
         }
 
         if (typeName)
-            parent.pop_back();      
+            parent.pop_back();
         out.appendf("</%s>",tag);
     }
     else if (type->isArray())
@@ -2063,7 +2065,7 @@ static void genSampleXml(StringStack& parent, IXmlType* type, StringBuffer& out,
             parent.push_back(typeName);
         genSampleXml(parent,itemType,item,itemName);
         if (typeName)
-            parent.pop_back();      
+            parent.pop_back();
 
         // gen two items
         out.appendf("<%s>%s%s</%s>", tag,item.str(),item.str(),tag);
@@ -2346,7 +2348,7 @@ int EspHttpBinding::onFinishUpload(IEspContext &ctx, CHttpRequest* request, CHtt
 int EspHttpBinding::getWsdlMessages(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda)
 {
     bool allMethods = (method==NULL || !*method);
-    
+
     MethodInfoArray methods;
     getQualifiedNames(context, methods);
     int count=methods.ordinality();
@@ -2416,7 +2418,7 @@ int EspHttpBinding::getWsdlBindings(IEspContext &context, CHttpRequest *request,
 
     content.appendf("<binding name=\"%sServiceSoap\" type=\"tns:%sServiceSoap\">", serviceName.str(), serviceName.str());
     content.append("<soap:binding transport=\"http://schemas.xmlsoap.org/soap/http\" style=\"document\"/>");
-    
+
     bool allMethods = (method==NULL || !*method);
     MethodInfoArray methods;
     getQualifiedNames(context, methods);
@@ -2436,7 +2438,7 @@ int EspHttpBinding::getWsdlBindings(IEspContext &context, CHttpRequest *request,
                 content.append("<soap:body use=\"literal\"/></input>");
                 content.append("<output><soap:body use=\"literal\"/></output>");
                 content.append("<fault  name=\"excfault\"><soap:fault name=\"excfault\" use=\"literal\"/></fault>");
-        
+
                 content.append("</operation>");
                 if (!allMethods) // no need to continue
                     break;
@@ -2560,8 +2562,8 @@ int EspHttpBinding::onGetIndex(IEspContext &context, CHttpRequest* request,  CHt
                 list->appendContent(new CHtmlLink(method.m_label.str(), wsLink.str()));
             }
         }
-        
-        page.appendContent(new CHtmlText("<br/>For a formal definition, please review the "));      
+
+        page.appendContent(new CHtmlText("<br/>For a formal definition, please review the "));
         urlParams.append(urlParams.length()>0 ? "&wsdl" : "?wsdl");
 
         wsLink.clear().appendf("%s", urlParams.str());
@@ -2601,7 +2603,7 @@ void EspHttpBinding::escapeSingleQuote(StringBuffer& src, StringBuffer& escaped)
     {
         if (*p == '\'')
             escaped.append("&apos;");
-        else 
+        else
             escaped.append(*p);
     }
 }
@@ -2653,7 +2655,7 @@ int EspHttpBinding::onGetXForm(IEspContext &context, CHttpRequest* request, CHtt
         if (!getUrlParams(context.queryRequestParameters(),params))
             params.appendf("%cver_=%g",(params.length()>0) ? '&' : '?', context.getClientVersion());
         xform->setStringParameter("queryParams", params.str());
-        
+
         StringBuffer tmp,escaped;
         getMethodHelp(context, serviceQName, methodQName, tmp);
         escapeSingleQuote(tmp,escaped);
@@ -2693,7 +2695,7 @@ int EspHttpBinding::onGetXForm(IEspContext &context, CHttpRequest* request, CHtt
                 break;
             }
         }
-        xform->transform(page);     
+        xform->transform(page);
         response->setContentType("text/html");
         response->setContent(page.str());
     }
@@ -2759,7 +2761,7 @@ int EspHttpBinding::onGetForm(IEspContext &context, CHttpRequest* request, CHttp
                             "<tr bgColor=\"#ffcc66\">"
                                 "<td height=\"3\">"
                                     "<p align=\"left\">");
-                                            
+
                                 page.appendf("<b>&gt; %s</b>", methodQName.str());
                                 page.append("</p>"
                                 "</td>"
@@ -2810,25 +2812,25 @@ int EspHttpBinding::onGetForm(IEspContext &context, CHttpRequest* request, CHttp
         response->setContent(page.str());
         response->setContentType("text/html");
     }
-    
+
     response->send();
 
     return 0;
 }
 
-                          
+
 int EspHttpBinding::formatHtmlResultSet(IEspContext &context, const char *serv, const char *method, const char *resultsXml, StringBuffer &html)
 {
     Owned<IPropertyTree> ptree = createPTreeFromXMLString(resultsXml);
-    
+
     Owned<IPropertyTreeIterator> exceptions = ptree->getElements("//Exception");
     ForEach(*exceptions.get())
     {
         IPropertyTree &xcpt = exceptions->query();
-        html.appendf("<br/>Exception: <br/>Reported by: %s <br/>Message: %s <br/>", 
+        html.appendf("<br/>Exception: <br/>Reported by: %s <br/>Message: %s <br/>",
             xcpt.queryProp("Source"), xcpt.queryProp("Message"));
     }
-    
+
     Owned<IPropertyTreeIterator> datasets = ptree->getElements("//Dataset");
     ForEach(*datasets.get())
     {
@@ -2842,14 +2844,14 @@ int EspHttpBinding::formatHtmlResultSet(IEspContext &context, const char *serv,
         if (row1)
         {
             html.append("<tr><td bgcolor=\"#808080\"><font face=\"Verdana\" size=\"2\">&nbsp;</font></td>");
-            
+
             Owned<IPropertyTreeIterator> columns = row1->getElements("*");
             ForEach(*columns.get())
             {
                 const char *title = columns->query().queryName();
                 html.appendf("<td align=\"center\" bgcolor=\"#808080\"><font face=\"Verdana\" size=\"2\" color=\"#E0E0E0\"><b>%s</b></font></td>", (title!=NULL) ? title : "&nbsp;");
-            }                       
-                    
+            }
+
             html.append("</tr>");
         }
 
@@ -2861,21 +2863,21 @@ int EspHttpBinding::formatHtmlResultSet(IEspContext &context, const char *serv,
             {
                 IPropertyTree &row = datarows->query();
                 Owned<IPropertyTreeIterator> columns = row.getElements("*");
-                
+
                 html.appendf("<td align=\"center\" bgcolor=\"#808080\"><font face=\"Verdana\" size=\"2\" color=\"#E0E0E0\"><b>%d</b></font></td>", count++);
                 ForEach(*columns.get())
                 {
                     const char *value = columns->query().queryProp(NULL);
                     html.appendf("<td align=\"center\" bgcolor=\"#E0E0E0\"><font face=\"Verdana\" size=\"2\" color=\"#000000\">%s</font></td>", (value!=NULL) ? value : "&nbsp;");
-                }                       
-                        
+                }
+
                 html.append("</tr>");
             }
         }
-    
+
         html.append("</td></tr></table></table>");
     }
-    
+
     return 0;
 }
 
@@ -2928,7 +2930,7 @@ int EspHttpBinding::formatResultsPage(IEspContext &context, const char *serv, co
                         "<tr bgColor=\"#ffcc66\">"
                             "<td height=\"3\">"
                                 "<p align=\"left\">");
-                                        
+
                             page.appendf("<b>&gt; %s Results</b>", methodQName.str());
                             page.append("</p>"
                             "</td>"
@@ -2967,7 +2969,7 @@ bool EspHttpBinding::setContentFromFile(IEspContext &context, CHttpResponse &res
     return false;
 }
 
-void EspHttpBinding::onBeforeSendResponse(IEspContext& context, CHttpRequest* request, MemoryBuffer& content, 
+void EspHttpBinding::onBeforeSendResponse(IEspContext& context, CHttpRequest* request, MemoryBuffer& content,
                                       const char *serviceName, const char* methodName)
 {
     IProperties* params = request->queryParameters();
@@ -2977,7 +2979,7 @@ void EspHttpBinding::onBeforeSendResponse(IEspContext& context, CHttpRequest* re
         sortResponse(context, request, content, serviceName, methodName);
 }
 
-void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* request, MemoryBuffer& content, 
+void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* request, MemoryBuffer& content,
                                       const char *service, const char* method)
 {
     StringBuffer serviceQName;
@@ -2985,15 +2987,15 @@ void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* reques
 
     if (!qualifyServiceName(context, service, method, serviceQName, &methodQName))
         return;
-            
+
     StringBuffer xml,xsd;
-    
+
     // name space
     StringBuffer ns;
     generateNamespace(context, request, serviceQName.str(), methodQName.str(), ns);
 
     // XML
-    Owned<IPropertyTree> tree; 
+    Owned<IPropertyTree> tree;
     try {
         tree.setown(createPTreeFromXMLString(content.length(), content.toByteArray()));
         // format it for better error message
@@ -3001,14 +3003,14 @@ void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* reques
 
         //Hack: add default name space to XML
         const char* end = strstr(xml, "<?xml");
-        if (end) 
+        if (end)
         {
             end = strstr(end+5, "?>");
             if (end)
                 end = strchr(end+2, '>');
             if (!end)
                 throw MakeStringException(-1,"Invalid response XML in processing instruction");
-        } 
+        }
         else
         {
             end = strchr(xml, '>');
@@ -3033,7 +3035,7 @@ void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* reques
 
     // schema
     getSchema(xsd,context,request,serviceQName,methodQName,true);
-            
+
     // validation
     if (getEspLogLevel()>LogMax)
         DBGLOG("[VALIDATE] xml: %s\nxsd: %s\nns: %s",xml.str(), xsd.str(), ns.str());
@@ -3068,7 +3070,7 @@ void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* reques
     content.setBuffer(len, temp.detach(), true);
 }
 
-void EspHttpBinding::sortResponse(IEspContext& context, CHttpRequest* request, MemoryBuffer& content, 
+void EspHttpBinding::sortResponse(IEspContext& context, CHttpRequest* request, MemoryBuffer& content,
                                       const char *serviceName, const char* methodName)
 {
     ESPLOG(LogNormal,"Sorting Response XML...");
@@ -3088,7 +3090,7 @@ void EspHttpBinding::sortResponse(IEspContext& context, CHttpRequest* request, M
         if (getEspLogLevel()>LogNormal)
             DBGLOG("XML sorted: %s", result.str());
         unsigned len = result.length();
-        content.setBuffer(len, result.detach(), true);      
+        content.setBuffer(len, result.detach(), true);
     } catch (IException* e) {
         StringBuffer msg;
         IERRLOG("Unexpected error: parsing XML: %s", e->errorMessage(msg).str());
diff --git a/esp/bindings/http/platform/httpbinding.hpp b/esp/bindings/http/platform/httpbinding.hpp
index 93821268e5b..e36ba07097f 100644
--- a/esp/bindings/http/platform/httpbinding.hpp
+++ b/esp/bindings/http/platform/httpbinding.hpp
@@ -111,6 +111,7 @@ interface IEspWsdlSections
 //  virtual MethodInfoArray & queryQualifiedNames(IEspContext& ctx)=0;
     virtual int getQualifiedNames(IEspContext& ctx, MethodInfoArray & methods)=0;
     virtual int getXsdDefinition(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda)=0;
+    virtual int getXmlFilename(StringBuffer &filename)=0;
     virtual int getWsdlMessages(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda)=0;
     virtual int getWsdlPorts(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda)=0;
     virtual int getWsdlBindings(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda)=0;
@@ -344,6 +345,7 @@ class esp_http_decl EspHttpBinding :
 //  MethodInfoArray &queryQualifiedNames(IEspContext& ctx) { m_methods.popAll(); getQualifiedNames(ctx,m_methods); return m_methods;};
 
     int getXsdDefinition(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda){return 0;};
+    int getXmlFilename(StringBuffer &filename) {return 0;};
     int getWsdlMessages(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda);
     int getWsdlPorts(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda);
     int getWsdlBindings(IEspContext &context, CHttpRequest *request, StringBuffer &content, const char *service, const char *method, bool mda);
@@ -427,9 +429,21 @@ class esp_http_decl EspHttpBinding :
 
     static void escapeSingleQuote(StringBuffer& src, StringBuffer& escaped);
 
+    virtual bool getDefaultClientVersion(double &ver) {ver=0; return true;}
+
+    double getVersion(IEspContext &context)
+    {
+        double version = context.getClientVersion();
+        if (version == 0.0)
+        {
+            getDefaultClientVersion(version);
+        }
+        return version;
+    }
+
 protected:
     virtual bool basicAuth(IEspContext* ctx);
-    int getWsdlOrXsd(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method, bool isWsdl);
+    int getServiceWsdlOrXsd(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method, bool isWsdl);
     virtual bool getSchema(StringBuffer& schema, IEspContext &ctx, CHttpRequest* req, const char *service, const char *method,bool standalone);
     virtual void appendSchemaNamespaces(IPropertyTree *namespaces, IEspContext &ctx, CHttpRequest* req, const char *service, const char *method){}
     void generateSampleXml(bool isRequest, IEspContext &context, CHttpRequest* request, CHttpResponse* response,    const char *serv, const char *method);
diff --git a/esp/esdllib/CMakeLists.txt b/esp/esdllib/CMakeLists.txt
index 72dde89ae1e..e79da490aa3 100644
--- a/esp/esdllib/CMakeLists.txt
+++ b/esp/esdllib/CMakeLists.txt
@@ -27,6 +27,7 @@ include_directories (
     ${HPCC_SOURCE_DIR}/system/include
     ${HPCC_SOURCE_DIR}/esp/esdllib
     ${HPCC_SOURCE_DIR}/esp/services/common
+    ${HPCC_SOURCE_DIR}/esp/esdlscriptlib
     ${HPCC_SOURCE_DIR}/system/jlib
     ${HPCC_SOURCE_DIR}/system/security/shared
     ${HPCC_SOURCE_DIR}/rtl/eclrtl
@@ -43,23 +44,11 @@ set ( SRCS
     esdl_def.cpp
     esdl_def_helper.cpp
     esdl_transformer2.cpp
-    esdl_script.cpp
     params2xml.cpp
-    ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp/fxpp/FragmentedXmlPullParser.cpp;
     ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp/xpp/xpputils.cpp
     ${HPCC_SOURCE_DIR}/esp/services/common/wsexcept.cpp
 )
 
-if (USE_LIBXSLT)
-    list (APPEND SRCS
-        esdl_xpath_extensions_libxml.cpp
-    )
-else()
-    list (APPEND SRCS
-        esdl_xpath_extensions_unsupported.cpp
-    )
-endif()
-
 HPCC_ADD_LIBRARY( esdllib SHARED ${SRCS}
     ${HEADERS}
 )
@@ -71,8 +60,7 @@ add_dependencies ( esdllib jlib espscm)
 target_link_libraries ( esdllib
     jlib
     xmllib
-    thorhelper
-    esphttp
+    dllserver
 )
 
 IF (USE_LIBXSLT)
diff --git a/esp/esdlscriptlib/CMakeLists.txt b/esp/esdlscriptlib/CMakeLists.txt
new file mode 100644
index 00000000000..15e67acd136
--- /dev/null
+++ b/esp/esdlscriptlib/CMakeLists.txt
@@ -0,0 +1,72 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2013 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+# Component: esdllib
+
+project( esdllib )
+
+include_directories (
+    ${HPCC_SOURCE_DIR}/system/xmllib
+    ${HPCC_SOURCE_DIR}/esp/bindings
+    ${HPCC_SOURCE_DIR}/esp/bindings/http/client
+    ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp
+    ${HPCC_SOURCE_DIR}/esp/platform
+    ${HPCC_SOURCE_DIR}/system/include
+    ${HPCC_SOURCE_DIR}/esp/services/common
+    ${HPCC_SOURCE_DIR}/system/jlib
+    ${HPCC_SOURCE_DIR}/system/security/shared
+    ${HPCC_SOURCE_DIR}/rtl/eclrtl
+    ${HPCC_SOURCE_DIR}/rtl/include #IXMLWriter
+    ${HPCC_SOURCE_DIR}/common/dllserver #loading plugins
+    ${HPCC_SOURCE_DIR}/system/masking/include
+)
+
+ADD_DEFINITIONS ( -D_USRDLL -DESDLSCRIPTLIB_EXPORTS )
+
+set ( SRCS
+    esdl_script.cpp
+    ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp/fxpp/FragmentedXmlPullParser.cpp;
+    ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp/xpp/xpputils.cpp
+)
+
+if (USE_LIBXSLT)
+    list (APPEND SRCS
+        esdl_xpath_extensions_libxml.cpp
+    )
+else()
+    list (APPEND SRCS
+        esdl_xpath_extensions_unsupported.cpp
+    )
+endif()
+
+HPCC_ADD_LIBRARY( esdlscriptlib SHARED ${SRCS}
+    ${HEADERS}
+)
+
+install ( TARGETS esdlscriptlib RUNTIME DESTINATION bin LIBRARY DESTINATION lib )
+
+add_dependencies ( esdlscriptlib jlib espscm)
+
+target_link_libraries ( esdlscriptlib
+    jlib
+    dllserver
+    esphttp
+)
+
+IF (USE_LIBXSLT)
+    include_directories (
+         ${LIBXML2_INCLUDE_DIR}
+    )
+ENDIF()
diff --git a/esp/esdllib/esdl_script.cpp b/esp/esdlscriptlib/esdl_script.cpp
similarity index 99%
rename from esp/esdllib/esdl_script.cpp
rename to esp/esdlscriptlib/esdl_script.cpp
index dd3d7bf5f0d..b1a3db77ac8 100644
--- a/esp/esdllib/esdl_script.cpp
+++ b/esp/esdlscriptlib/esdl_script.cpp
@@ -3133,7 +3133,7 @@ class CEsdlTransformOperationSetTraceOptions : public CEsdlTransformOperationWit
         const char* locked = stag.getValue("locked");
         if (!isEmptyString(locked))
             m_locked.setown(compileXpath(locked));
-        
+
         if (!m_enabled && !m_locked)
             recordError(ESDL_SCRIPT_MissingOperationAttr, "missing all options");
     }
@@ -3911,11 +3911,11 @@ class CEsdlTransformMethodMap : public CInterfaceOf<IEsdlTransformMethodMap>
     }
 };
 
-esdl_decl IEsdlScriptContext* createEsdlScriptContext(IEspContext* espCtx, IEsdlFunctionRegister* functionRegister, IDataMaskingEngine* engine)
+esdlscript_decl IEsdlScriptContext* createEsdlScriptContext(IEspContext* espCtx, IEsdlFunctionRegister* functionRegister, IDataMaskingEngine* engine)
 {
     return new CEsdlScriptContext(espCtx, functionRegister, engine);
 }
-esdl_decl IEsdlTransformMethodMap *createEsdlTransformMethodMap()
+esdlscript_decl IEsdlTransformMethodMap *createEsdlTransformMethodMap()
 {
     return new CEsdlTransformMethodMap();
 }
diff --git a/esp/esdllib/esdl_script.hpp b/esp/esdlscriptlib/esdl_script.hpp
similarity index 90%
rename from esp/esdllib/esdl_script.hpp
rename to esp/esdlscriptlib/esdl_script.hpp
index 4566341881d..9a935a9db1a 100644
--- a/esp/esdllib/esdl_script.hpp
+++ b/esp/esdlscriptlib/esdl_script.hpp
@@ -18,10 +18,10 @@
 #ifndef ESDL_SCRIPT_HPP_
 #define ESDL_SCRIPT_HPP_
 
-#ifdef ESDLLIB_EXPORTS
- #define esdl_decl DECL_EXPORT
+#ifdef ESDLSCRIPTLIB_EXPORTS
+ #define esdlscript_decl DECL_EXPORT
 #else
- #define esdl_decl
+ #define esdlscript_decl
 #endif
 
 #include "jlib.hpp"
@@ -30,7 +30,7 @@
 #include "jlog.hpp"
 #include "esp.hpp"
 
-#include "esdl_def.hpp"
+//#include "esdl_def.hpp"
 
 #include "datamaskingengine.hpp"
 #include "tracer.h"
@@ -163,7 +163,7 @@ interface IEsdlScriptContext : extends ISectionalXmlDocModel
  * The absence of a sectional document model in the parameter list implies the returned instance
  * is responsible for creating its own model.
  */
-extern "C" esdl_decl IEsdlScriptContext* createEsdlScriptContext(IEspContext* espCtx, IEsdlFunctionRegister* functionRegister, IDataMaskingEngine* engine);
+extern "C" esdlscript_decl IEsdlScriptContext* createEsdlScriptContext(IEspContext* espCtx, IEsdlFunctionRegister* functionRegister, IDataMaskingEngine* engine);
 
 interface IEsdlCustomTransform : extends IInterface
 {
@@ -229,11 +229,11 @@ interface IEsdlTransformMethodMap : extends IInterface
     virtual void bindFunctionCalls() = 0;
 };
 
-esdl_decl IEsdlTransformMethodMap *createEsdlTransformMethodMap();
+esdlscript_decl IEsdlTransformMethodMap *createEsdlTransformMethodMap();
 
-esdl_decl IEsdlCustomTransform *createEsdlCustomTransform(const char *scriptXml, const char *ns_prefix);
+esdlscript_decl IEsdlCustomTransform *createEsdlCustomTransform(const char *scriptXml, const char *ns_prefix);
 
-esdl_decl void processServiceAndMethodTransforms(IEsdlScriptContext * scriptCtx, std::initializer_list<IEsdlTransformSet *> const &transforms, const char *srcSection, const char *tgtSection);
-esdl_decl void registerEsdlXPathExtensions(IXpathContext *xpathCtx, IEsdlScriptContext *scriptCtx, const StringArray &prefixes);
+esdlscript_decl void processServiceAndMethodTransforms(IEsdlScriptContext * scriptCtx, std::initializer_list<IEsdlTransformSet *> const &transforms, const char *srcSection, const char *tgtSection);
+esdlscript_decl void registerEsdlXPathExtensions(IXpathContext *xpathCtx, IEsdlScriptContext *scriptCtx, const StringArray &prefixes);
 
 #endif /* ESDL_SCRIPT_HPP_ */
diff --git a/esp/esdllib/esdl_xpath_extensions_libxml.cpp b/esp/esdlscriptlib/esdl_xpath_extensions_libxml.cpp
similarity index 100%
rename from esp/esdllib/esdl_xpath_extensions_libxml.cpp
rename to esp/esdlscriptlib/esdl_xpath_extensions_libxml.cpp
diff --git a/esp/esdllib/esdl_xpath_extensions_unsupported.cpp b/esp/esdlscriptlib/esdl_xpath_extensions_unsupported.cpp
similarity index 100%
rename from esp/esdllib/esdl_xpath_extensions_unsupported.cpp
rename to esp/esdlscriptlib/esdl_xpath_extensions_unsupported.cpp
diff --git a/esp/logging/logginglib/CMakeLists.txt b/esp/logging/logginglib/CMakeLists.txt
index 1beb7a573f7..23e3727bbd7 100644
--- a/esp/logging/logginglib/CMakeLists.txt
+++ b/esp/logging/logginglib/CMakeLists.txt
@@ -32,6 +32,7 @@ include_directories (
     ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/Platform   #CSoapRequestBinding
     ${HPCC_SOURCE_DIR}/esp/clients                  #edwin.h in generated/ws_loggingservice.esp
     ${HPCC_SOURCE_DIR}/esp/esdllib
+    ${HPCC_SOURCE_DIR}/esp/esdlscriptlib
     ${HPCC_SOURCE_DIR}/common/thorhelper
 )
 
@@ -58,5 +59,5 @@ target_link_libraries ( logginglib
     jlib
     xmllib
     esphttp
-    esdllib
+    esdlscriptlib
 )
diff --git a/esp/protocols/http/CMakeLists.txt b/esp/protocols/http/CMakeLists.txt
index b2d39e4e075..db16c06339a 100644
--- a/esp/protocols/http/CMakeLists.txt
+++ b/esp/protocols/http/CMakeLists.txt
@@ -64,10 +64,11 @@ include_directories(
     ./../../../system/security/shared
     ./../../../system/security/LdapSecurity
     ./../../../system/security/zcrypt
-    ./../../../system/mp 
+    ./../../../system/mp
     ./../../../dali/base
     ./../../../common/workunit
     ${HPCC_SOURCE_DIR}/common/thorhelper
+    ${HPCC_SOURCE_DIR}/esp/esdllib
     )
 
 add_definitions(-DESPHTTP_EXPORTS -DESP_TIMING -D_USRDLL -DESP_PLUGIN -DTXSUMMARY_EXPORTS)
@@ -76,6 +77,7 @@ if(USE_OPENLDAP)
 endif()
 HPCC_ADD_LIBRARY(esphttp SHARED ${SRCS})
 add_dependencies(esphttp  espscm)
+
 install(TARGETS esphttp RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR})
 target_link_libraries(
     esphttp
@@ -86,6 +88,7 @@ target_link_libraries(
     dalibase
     thorhelper      # this should not be dependent on the engine helper dll
     workunit        # neither should it be dependent on the wokunit dll
+    esdllib
     )
 
 if(LIBMEMCACHED_FOUND)
diff --git a/esp/scm/additional.cmake b/esp/scm/additional.cmake
index 105dbaa7b63..e34b4b9c76a 100644
--- a/esp/scm/additional.cmake
+++ b/esp/scm/additional.cmake
@@ -53,6 +53,9 @@ foreach ( loop_var ${ESPSCM_SRCS} )
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}_esp.ipp PROPERTIES GENERATED TRUE)
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}.xml PROPERTIES GENERATED TRUE)
     set ( ESP_GENERATED_INCLUDES ${ESP_GENERATED_INCLUDES} ${ESPSCM_GENERATED_DIR}/${result}.esp ${ESPSCM_GENERATED_DIR}/${result}.hpp ${ESPSCM_GENERATED_DIR}/${result}.ipp ${ESPSCM_GENERATED_DIR}/${result}_esp.ipp ${ESPSCM_GENERATED_DIR}/${result}.xml )
+    if ( PLATFORM )
+        Install( FILES ${ESPSCM_GENERATED_DIR}/${result}.xml DESTINATION componentfiles/esdl_files COMPONENT Runtime )
+    endif ( PLATFORM )
 endforeach ( loop_var ${ESPSCM_SRCS} )
 
 include_directories ( ${ESPSCM_GENERATED_DIR} ${HPCC_SOURCE_DIR}/esp/espcommon)
diff --git a/esp/scm/smcscm.cmake b/esp/scm/smcscm.cmake
index 42ff20ff9d3..d90d80364c3 100644
--- a/esp/scm/smcscm.cmake
+++ b/esp/scm/smcscm.cmake
@@ -70,6 +70,9 @@ foreach ( loop_var ${ESPSCM_SRCS} )
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}_esp.ipp PROPERTIES GENERATED TRUE)
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}.xml PROPERTIES GENERATED TRUE)
     set ( ESP_GENERATED_INCLUDES ${ESP_GENERATED_INCLUDES} ${ESPSCM_GENERATED_DIR}/${result}.esp ${ESPSCM_GENERATED_DIR}/${result}.hpp ${ESPSCM_GENERATED_DIR}/${result}.ipp ${ESPSCM_GENERATED_DIR}/${result}_esp.ipp ${ESPSCM_GENERATED_DIR}/${result}.xml )
+    if ( PLATFORM )
+        Install( FILES ${ESPSCM_GENERATED_DIR}/${result}.xml DESTINATION componentfiles/esdl_files COMPONENT Runtime )
+    endif ( PLATFORM )
 endforeach ( loop_var ${ESPSCM_SRCS} )
 
 include_directories ( ${ESPSCM_GENERATED_DIR} ${HPCC_SOURCE_DIR}/esp/espcommon )
diff --git a/esp/services/esdl_svc_engine/CMakeLists.txt b/esp/services/esdl_svc_engine/CMakeLists.txt
index 969d98f23ee..796c164eba2 100755
--- a/esp/services/esdl_svc_engine/CMakeLists.txt
+++ b/esp/services/esdl_svc_engine/CMakeLists.txt
@@ -61,6 +61,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/rtl/eclrtl
          ${HPCC_SOURCE_DIR}/rtl/include
          ${HPCC_SOURCE_DIR}/esp/esdllib
+         ${HPCC_SOURCE_DIR}/esp/esdlscriptlib
          ${HPCC_SOURCE_DIR}/esp/logging/logginglib
          ${HPCC_SOURCE_DIR}/esp/logging/loggingmanager
          ${CMAKE_BINARY_DIR}
@@ -86,6 +87,7 @@ target_link_libraries ( esdl_svc_engine
          remote
          dalibase
          esdllib
+         esdlscriptlib
          dllserver
          dalibase
          ${COMMON_ESP_SERVICE_LIBS}
diff --git a/esp/services/ws_esdlconfig/CMakeLists.txt b/esp/services/ws_esdlconfig/CMakeLists.txt
index b2f01116d01..87d794da1f3 100644
--- a/esp/services/ws_esdlconfig/CMakeLists.txt
+++ b/esp/services/ws_esdlconfig/CMakeLists.txt
@@ -57,6 +57,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/smc/SMCLib
          ${HPCC_SOURCE_DIR}/esp/services/esdl_svc_engine
          ${HPCC_SOURCE_DIR}/esp/esdllib
+         ${HPCC_SOURCE_DIR}/esp/esdlscriptlib
          ${HPCC_SOURCE_DIR}/esp/logging/logginglib
          ${HPCC_SOURCE_DIR}/esp/logging/loggingmanager
          ${HPCC_SOURCE_DIR}/common/thorhelper
diff --git a/esp/xslt/CMakeLists.txt b/esp/xslt/CMakeLists.txt
index 91ecc66a870..53666fb5690 100644
--- a/esp/xslt/CMakeLists.txt
+++ b/esp/xslt/CMakeLists.txt
@@ -43,6 +43,7 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/esdl2monitor.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/esdl2monitor_cassandra.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/esxdl2xsd.xslt
+    ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_xml2xsd.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/esdl2java_srvbase.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/esdl2java_srvdummy.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/esdl2cpp_srvbasehpp.xslt
diff --git a/esp/xslt/esp_service_xml2xsd.xslt b/esp/xslt/esp_service_xml2xsd.xslt
new file mode 100644
index 00000000000..dc1a6b3d7d0
--- /dev/null
+++ b/esp/xslt/esp_service_xml2xsd.xslt
@@ -0,0 +1,604 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+##############################################################################
+#    HPCC SYSTEMS software Copyright (C) 2023 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+##############################################################################
+-->
+
+<!--<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                xmlns="http://schemas.xmlsoap.org/wsdl/"
+                xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                exclude-result-prefixes="wsdl">
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+    <xsl:param name="create_wsdl" select="false()"/>
+    <xsl:param name="location" select="'http://localhost:8000/WsService?ver_=0'"/>
+    <xsl:param name="tnsParam" select="/esxdl/@ns_uri"/>
+    <xsl:param name="version" select="/esxdl/@version"/>
+    <xsl:param name="no_annot_Param" select="false()"/>
+    <xsl:param name="all_annot_Param" select="false()"/>
+    <xsl:param name="no_exceptions_inline" select="false()"/>
+
+    <!--
+        Note: This version of the stylesheet assumes that the XML input has been processed
+        in the following ways:
+
+        - All structures not explicitly referenced or used in another structure
+          have been stripped out.
+        - All ancestor structure's elements are collapsed into the defintion
+          of their children.
+        - In order for ArrayOf definitions to be generated, the esdl XML this processes
+          must have the desired structures marked with 'arrayOf="1"' attributes.
+    -->
+
+    <xsl:template match="esxdl">
+        <xsl:choose>
+            <xsl:when test="$create_wsdl">
+                <xsl:call-template name="CreateWsdl"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="CreateSchema"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="EsdlStruct">
+        <xsd:complexType>
+            <xsl:attribute name="name">
+                <xsl:value-of select="@name"/>
+            </xsl:attribute>
+            <!--
+              Only emit the xsd group element if our current struct has at least one child node.
+            -->
+            <xsl:if test="child::*[1]">
+                <xsl:variable name="xsd_group">
+                    <xsl:choose>
+                        <xsl:when test="@xsd_group">
+                            <xsl:value-of select="@xsd_group"/>
+                        </xsl:when>
+                        <xsl:otherwise>all</xsl:otherwise>
+                    </xsl:choose>
+                </xsl:variable>
+                <xsl:element name="xsd:{$xsd_group}">
+                    <xsl:apply-templates select="EsdlElement|EsdlArray|EsdlEnum"/>
+                </xsl:element>
+            </xsl:if>
+        </xsd:complexType>
+        <!--
+            Under the original non-esdl schema/wsdl generation, when an EspArray is defined:
+
+                ESParray<ESPstruct RedFlag> RedFlags;
+
+            it causes the the output of a separate complexType named 'ArrayOfRedFlags'.
+            Contrast that with an ESParray definition like:
+
+                ESParray<ESPstruct RiskIndicator, HighRiskIndicator> HighRiskIndicators;
+
+            which generates XSD output consisting of an unnamed complexType in place.
+          We duplicate that behavior by adding an 'arrayOf' attribute to EsdlStruct
+          definitions which are used in such ArrayOf definitions. In addition to the
+          actual struct's defn output above, we output it's related ArrayOf defn below.
+        -->
+        <xsl:if test="@arrayOf='1'">
+            <!--
+                For whatever reason the current non-esdl based XSD/WSDL generator always
+                generates an 'ArrayOfName' defn whenever an 'ArrayOfNameEx' is generated
+                even if ArrayOfName is never used. Duplicate this behavior here but it's
+                isolated to this one location so will be easy to remove if desired.
+            -->
+            <xsl:if test="@name='NameEx'">
+                <xsd:complexType name="ArrayOfName">
+                    <xsd:sequence>
+                        <xsd:element minOccurs="0" maxOccurs="unbounded" name="Name" type="tns:Name"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsl:if>
+            <xsd:complexType>
+                <xsl:attribute name="name">ArrayOf<xsl:value-of select="@name"/>
+                </xsl:attribute>
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded">
+                        <xsl:attribute name="name">
+                            <xsl:value-of select="@name"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="type">tns:<xsl:value-of select="@name"/>
+                        </xsl:attribute>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="EsdlElement">
+        <xsd:element>
+            <xsl:if test="not(@required)">
+                <xsl:attribute name="minOccurs">0</xsl:attribute>
+            </xsl:if>
+            <xsl:attribute name="name">
+                <xsl:choose>
+                    <xsl:when test="@xml_tag">
+                        <xsl:value-of select="@xml_tag"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="@name"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <xsl:attribute name="type">
+                <xsl:choose>
+                    <xsl:when test="@xsd_type">
+                        <xsl:value-of select="@xsd_type"/>
+                    </xsl:when>
+                    <xsl:when test="@xsd_extended_type">xsd:<xsl:value-of select="@xsd_extended_type"/>
+                    </xsl:when>
+                    <xsl:when test="@type='bool'">xsd:<xsl:value-of select="'boolean'"/>
+                    </xsl:when>
+                    <xsl:when test="@type='unsigned'">xsd:<xsl:value-of select="'unsignedInt'"/>
+                    </xsl:when>
+                    <xsl:when test="@type='binary'">xsd:<xsl:value-of select="'base64Binary'"/>
+                    </xsl:when>
+                    <xsl:when test="@type='int64'">xsd:<xsl:value-of select="'long'"/>
+                    </xsl:when>
+                    <xsl:when test="@type">xsd:<xsl:value-of select="@type"/>
+                    </xsl:when>
+                    <xsl:when test="@complex_type">tns:<xsl:value-of select="@complex_type"/>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
+            <!--
+                There are some .ecm files which use 'boolean' instead of 'bool', and for some reason those fields
+                don't ever have a 'default' attribute when the XSD is generated. Reproduce that behavior here:
+             -->
+            <xsl:if test="@default and @type != 'boolean'">
+                <xsl:attribute name="default">
+                    <xsl:choose>
+                        <xsl:when test="@type='bool' and @default='1'">true</xsl:when>
+                        <xsl:when test="@type='bool' and @default='0'">false</xsl:when>
+                        <!--
+                                The Request defined in wsm_echotest.ecm has a default value which includes some
+                                characters normally encoded (eg &amp;) in an XSDs attribute. The XSD currently
+                                generated by the ESPs doesn't encode them. I've hardcoded the default value here
+                                to duplicate that behavior. The XML generated by the esdl_def code encodes the
+                                characters already encoded so they'd need a double-decoding here. This seemed the
+                                simplest solution. Perhaps we need to revisit when and what the esdl_def toXML code
+                                encodes and what it doesn't.
+                         -->
+                        <xsl:when
+                                test="@name='ValueIn' and ../@name='EchoTestRequest' and starts-with(./@default, 'Test')">
+                            <xsl:text
+                                    disable-output-escaping="yes">Test string: &lt;abc&gt; &amp; &lt;def&gt;</xsl:text>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="@default"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="boolean($all_annot_Param)">
+                <xsl:if test="@html_head or @form_ui or @collapsed or @cols or @rows or @optional">
+                    <xsd:annotation>
+                        <xsd:appinfo>
+                            <form>
+                                <xsl:if test="@form_ui">
+                                    <xsl:attribute name="ui">
+                                        <xsl:value-of disable-output-escaping="yes" select="@form_ui"/>
+                                    </xsl:attribute>
+                                </xsl:if>
+                                <xsl:if test="@html_head">
+                                    <xsl:attribute name="html_head">
+                                        <xsl:value-of disable-output-escaping="yes" select="@html_head"/>
+                                    </xsl:attribute>
+                                </xsl:if>
+                                <xsl:if test="@collapsed">
+                                    <xsl:attribute name="collapsed">
+                                        <xsl:choose>
+                                            <xsl:when test="@collapsed=1">true</xsl:when>
+                                            <xsl:otherwise>false</xsl:otherwise>
+                                        </xsl:choose>
+                                    </xsl:attribute>
+                                </xsl:if>
+                                <xsl:if test="@cols">
+                                    <xsl:attribute name="formCols">
+                                        <xsl:value-of select="@cols"/>
+                                    </xsl:attribute>
+                                </xsl:if>
+                                <xsl:if test="@rows">
+                                    <xsl:attribute name="formRows">
+                                        <xsl:value-of select="@rows"/>
+                                    </xsl:attribute>
+                                </xsl:if>
+                                <xsl:if test="@optional">
+                                    <xsl:attribute name="optional">
+                                        <xsl:value-of select="@optional"/>
+                                    </xsl:attribute>
+                                </xsl:if>
+                            </form>
+                        </xsd:appinfo>
+                    </xsd:annotation>
+                </xsl:if>
+            </xsl:if>
+        </xsd:element>
+    </xsl:template>
+
+    <xsl:template match="EsdlEnumItem" mode="annotation">
+        <xsl:if test="@desc">
+            <item>
+                <xsl:attribute name="name">
+                    <xsl:value-of select="@enum"/>
+                </xsl:attribute>
+                <xsl:attribute name="description">
+                    <xsl:value-of select="@desc"/>
+                </xsl:attribute>
+            </item>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="EsdlEnumItem">
+        <xsd:enumeration>
+            <xsl:attribute name="value">
+                <xsl:value-of select="@enum"/>
+            </xsl:attribute>
+        </xsd:enumeration>
+    </xsl:template>
+
+    <xsl:template match="EsdlEnumType">
+        <xsd:simpleType>
+            <xsl:attribute name="name">
+                <xsl:value-of select="@name"/>
+            </xsl:attribute>
+            <!--
+                EnumType has annotation only if it's EnumItems have @desc attributes.
+                Check the first EnumItem to see if it has a @desc attribute
+             -->
+            <xsl:if test="(EsdlEnumItem[@desc]) and EsdlEnumItem/@desc!=''">
+                <xsl:if test="not($no_annot_Param) or boolean($all_annot_Param)">
+                    <xsd:annotation>
+                        <xsd:appinfo>
+                            <xsl:apply-templates select="EsdlEnumItem" mode="annotation"/>
+                        </xsd:appinfo>
+                    </xsd:annotation>
+                </xsl:if>
+            </xsl:if>
+            <xsd:restriction>
+                <xsl:attribute name="base">xsd:<xsl:value-of select="@base_type"/>
+                </xsl:attribute>
+                <xsl:apply-templates select="EsdlEnumItem"/>
+            </xsd:restriction>
+        </xsd:simpleType>
+    </xsl:template>
+
+    <xsl:template match="EsdlEnum">
+        <xsd:element>
+            <xsl:choose>
+                <xsl:when test="@required"></xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="minOccurs">0</xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:attribute name="name">
+                <xsl:choose>
+                    <xsl:when test="@xml_tag">
+                        <xsl:value-of select="@xml_tag"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="@name"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <xsl:attribute name="type">
+                <xsl:choose>
+                    <xsl:when test="@xsd_type">
+                        <xsl:value-of select="@xsd_type"/>
+                    </xsl:when>
+                    <xsl:when test="@enum_type">tns:<xsl:value-of select="@enum_type"/>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
+            <xsl:if test="@default or (@default='')">
+                <xsl:attribute name="default">
+                    <xsl:value-of select="@default"/>
+                </xsl:attribute>
+            </xsl:if>
+        </xsd:element>
+    </xsl:template>
+    <xsl:template match="EsdlArray">
+        <xsl:choose>
+            <xsl:when test="boolean(@item_tag)">
+                <xsd:element minOccurs="0">
+                    <xsl:attribute name="name">
+                        <xsl:choose>
+                            <xsl:when test="@xml_tag">
+                                <xsl:value-of select="@xml_tag"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="@name"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:element minOccurs="0" maxOccurs="unbounded">
+                                <xsl:attribute name="name">
+                                    <xsl:value-of select="@item_tag"/>
+                                </xsl:attribute>
+                                <xsl:choose>
+                                    <xsl:when test="@type='string'">
+                                        <xsl:attribute name="type">xsd:string</xsl:attribute>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:attribute name="type">tns:<xsl:value-of select="@type"/>
+                                        </xsl:attribute>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsd:element>
+                        </xsd:sequence>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:choose>
+                    <xsl:when test="@type='string'">
+                        <!--
+                            Adjust the element definition so that it's type is tns:EspStringArray to
+                            match the behavior of the current generator. Note that this doesn't generate
+                            the actual EspStringArray defn, just a reference to where it's used.
+                         -->
+                        <xsd:element minOccurs="0">
+                            <xsl:attribute name="name">
+                                <xsl:choose>
+                                    <xsl:when test="@xml_tag">
+                                        <xsl:value-of select="@xml_tag"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:value-of select="@name"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:attribute>
+                            <xsl:attribute name="type">tns:EspStringArray</xsl:attribute>
+                        </xsd:element>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsd:element minOccurs="0">
+                            <xsl:attribute name="name">
+                                <xsl:choose>
+                                    <xsl:when test="@xml_tag">
+                                        <xsl:value-of select="@xml_tag"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:value-of select="@name"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:attribute>
+                            <xsl:attribute name="type">tns:ArrayOf<xsl:value-of select="@type"/>
+                            </xsl:attribute>
+                        </xsd:element>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template match="EsdlList">
+        <xsd:element minOccurs="0" maxOccurs="unbounded">
+            <xsl:attribute name="name">
+                <xsl:value-of select="@name"/>
+            </xsl:attribute>
+            <xsl:attribute name="type">
+                <xsl:choose>
+                    <xsl:when test="@type='string'">xsd:string</xsl:when>
+                    <xsl:otherwise>tns:<xsl:value-of select="@type"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+        </xsd:element>
+    </xsl:template>
+    <xsl:template match="EsdlRequest">
+        <xsl:choose>
+            <xsl:when test="/esxdl/EsdlService/@use_method_name='1'">
+                <!--
+                    Output an xsd:element of this EsdlRequest structure for each EsdlMethod that
+                    uses this request_type. The name of the xsd:element matches the EsdlMethod/@name.
+                -->
+                <xsl:variable name="curRequest" select="."/>
+                <xsl:for-each select="/esxdl/EsdlService/EsdlMethod[@request_type=$curRequest/@name]">
+                    <xsd:element>
+                        <xsl:attribute name="name">
+                            <xsl:value-of select="@name"/>
+                        </xsl:attribute>
+                        <xsd:complexType>
+                            <xsd:all>
+                                <xsl:apply-templates
+                                        select="$curRequest/EsdlElement|$curRequest/EsdlArray|$curRequest/EsdlList|$curRequest/EsdlEnum"/>
+                            </xsd:all>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsd:element>
+                    <xsl:attribute name="name">
+                        <xsl:value-of select="@name"/>
+                    </xsl:attribute>
+                    <xsd:complexType>
+                        <xsd:all>
+                            <xsl:apply-templates select="EsdlElement|EsdlArray|EsdlList|EsdlEnum"/>
+                        </xsd:all>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template match="EsdlResponse">
+        <xsd:element>
+            <xsl:attribute name="name">
+                <xsl:value-of select="@name"/>
+            </xsl:attribute>
+            <xsd:complexType>
+                <xsd:all>
+                    <xsl:if test="@exceptions_inline and not($no_exceptions_inline)">
+                        <xsd:element name="Exceptions" type="tns:ArrayOfEspException" minOccurs="0" maxOccurs="1"/>
+                    </xsl:if>
+                    <xsl:apply-templates select="EsdlElement|EsdlArray|EsdlList|EsdlEnum"/>
+                </xsd:all>
+            </xsd:complexType>
+        </xsd:element>
+    </xsl:template>
+    <xsl:template match="EsdlService">
+        <xsl:variable name="useMethodName" select="@use_method_name='1'"/>
+        <message name="EspSoapFault" xmlns="http://schemas.xmlsoap.org/wsdl/">
+            <part name="parameters" element="tns:Exceptions"/>
+        </message>
+        <xsl:for-each select="/esxdl/EsdlMethod">
+            <message xmlns="http://schemas.xmlsoap.org/wsdl/">
+                <xsl:attribute name="name"><xsl:value-of select="@name"/>SoapIn</xsl:attribute>
+                <part name="parameters">
+                    <xsl:attribute name="element">
+                        <xsl:choose>
+                            <xsl:when test="$useMethodName">tns:<xsl:value-of select="@name"/>
+                            </xsl:when>
+                            <xsl:otherwise>tns:<xsl:value-of select="@request_type"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>
+                </part>
+            </message>
+            <message xmlns="http://schemas.xmlsoap.org/wsdl/">
+                <xsl:attribute name="name"><xsl:value-of select="@name"/>SoapOut</xsl:attribute>
+                <part name="parameters">
+                    <xsl:attribute name="element">tns:<xsl:value-of select="@response_type"/>
+                    </xsl:attribute>
+                </part>
+            </message>
+        </xsl:for-each>
+        <portType xmlns="http://schemas.xmlsoap.org/wsdl/">
+            <xsl:attribute name="name"><xsl:value-of select="@name"/>ServiceSoap</xsl:attribute>
+            <xsl:for-each select="/esxdl/EsdlMethod">
+                <operation>
+                    <xsl:attribute name="name">
+                        <xsl:value-of select="@name"/>
+                    </xsl:attribute>
+                    <input>
+                        <xsl:attribute name="message">tns:<xsl:value-of select="@name"/>SoapIn</xsl:attribute>
+                    </input>
+                    <output>
+                        <xsl:attribute name="message">tns:<xsl:value-of select="@name"/>SoapOut</xsl:attribute>
+                    </output>
+                    <fault name="excfault" message="tns:EspSoapFault"/>
+                </operation>
+            </xsl:for-each>
+        </portType>
+        <binding xmlns="http://schemas.xmlsoap.org/wsdl/">
+            <xsl:variable name="serviceName" select="@name"/>
+            <xsl:attribute name="name"><xsl:value-of select="@name"/>ServiceSoap</xsl:attribute>
+            <xsl:attribute name="type">tns:<xsl:value-of select="@name"/>ServiceSoap</xsl:attribute>
+            <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+            <xsl:for-each select="/esxdl/EsdlMethod">
+                <operation>
+                    <xsl:attribute name="name">
+                        <xsl:value-of select="@name"/>
+                    </xsl:attribute>
+                    <soap:operation style="document">
+                        <xsl:attribute name="soapAction"><xsl:value-of select="$serviceName"/>/<xsl:value-of
+                                select="@name"/>?ver_=<xsl:value-of select="$version"/>
+                        </xsl:attribute>
+                    </soap:operation>
+                    <input>
+                        <soap:body use="literal"/>
+                    </input>
+                    <output>
+                        <soap:body use="literal"/>
+                    </output>
+                    <fault name="excfault">
+                        <soap:fault name="excfault" use="literal"/>
+                    </fault>
+                </operation>
+            </xsl:for-each>
+        </binding>
+        <service xmlns="http://schemas.xmlsoap.org/wsdl/">
+            <xsl:attribute name="name">
+                <xsl:value-of select="@name"/>
+            </xsl:attribute>
+            <port>
+                <xsl:attribute name="name"><xsl:value-of select="@name"/>ServiceSoap</xsl:attribute>
+                <xsl:attribute name="binding">tns:<xsl:value-of select="@name"/>ServiceSoap</xsl:attribute>
+                <soap:address location="{$location}"/>
+            </port>
+        </service>
+    </xsl:template>
+
+    <xsl:template name="CreateSchema">
+        <xsl:param name="inwsdl" select="false()"/>
+        <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <xsl:attribute name="targetNamespace">
+                <xsl:value-of select="$tnsParam"/>
+            </xsl:attribute>
+            <xsl:copy-of select="namespace::tns"/>
+
+            <xsd:complexType name="EspException">
+                <xsd:all>
+                    <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="Audience" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="Source" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="Message" type="xsd:string" minOccurs="0"/>
+                </xsd:all>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfEspException">
+                <xsd:sequence>
+                    <xsd:element name="Source" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="Exception" type="tns:EspException" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:element name="Exceptions" type="tns:ArrayOfEspException"/>
+
+            <!--
+                The first Esdlstruct|EsdlRequest|EsdlResponse that contains a string array is marked with @espStringArray='1'
+                but we are changing order, so look for any object with espStringArray, and if there is one output the following definition
+            -->
+            <xsl:if test="*/@espStringArray='1'">
+                <xsd:complexType name="EspStringArray">
+                    <xsd:sequence>
+                        <xsd:element name="Item" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsl:if>
+
+            <xsl:apply-templates select="EsdlEnumType"/>
+            <xsl:apply-templates select="EsdlStruct"/>
+            <xsl:apply-templates select="EsdlRequest"/>
+            <xsl:apply-templates select="EsdlResponse"/>
+            <xsd:element name="string" nillable="true" type="xsd:string"/>
+        </xsd:schema>
+    </xsl:template>
+    <xsl:template name="CreateWsdl">
+        <definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+                     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                     xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+                     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+            <xsl:attribute name="targetNamespace">
+                <xsl:value-of select="$tnsParam"/>
+            </xsl:attribute>
+            <xsl:copy-of select="namespace::tns"/>
+            <types>
+                <xsl:call-template name="CreateSchema">
+                    <xsl:with-param name="inwsdl" select="true()"/>
+                </xsl:call-template>
+            </types>
+            <xsl:apply-templates select="EsdlService[1]"/>
+        </definitions>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/testing/unittests/CMakeLists.txt b/testing/unittests/CMakeLists.txt
index 3c5c40c755b..58153493d35 100644
--- a/testing/unittests/CMakeLists.txt
+++ b/testing/unittests/CMakeLists.txt
@@ -83,6 +83,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/bindings
          ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp
          ${HPCC_SOURCE_DIR}/esp/esdllib
+         ${HPCC_SOURCE_DIR}/esp/esdlscriptlib
          ${HPCC_SOURCE_DIR}/esp/logging
          ${HPCC_SOURCE_DIR}/esp/logging/logginglib
          ${HPCC_SOURCE_DIR}/esp/logging/loggingmanager
diff --git a/tools/hidl/hidlcomp.cpp b/tools/hidl/hidlcomp.cpp
index 18435d24ee0..eab25cd41f2 100644
--- a/tools/hidl/hidlcomp.cpp
+++ b/tools/hidl/hidlcomp.cpp
@@ -4995,6 +4995,9 @@ void EspServInfo::write_esp_binding_ipp()
     //method ==> processRequest
     outs("\tvirtual int processRequest(IRpcMessage* rpc_call, IRpcMessage* rpc_response);\n");
 
+    // method ===> getXmlFilename
+    outs("\tint getXmlFilename(StringBuffer &filename);\n");
+
     //method ==> getXsdDefinition
     outs("\tint getXsdDefinition(IEspContext &context, CHttpRequest* request, StringBuffer &content, const char *service, const char *method, bool mda);\n");
 
@@ -5049,7 +5052,7 @@ void EspServInfo::write_esp_binding_ipp()
     outs("\tvirtual int onGetInstantQuery(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *service, const char *method);\n");
 
     //Method ==> getDefaultClientVersion
-    outs("\tbool getDefaultClientVersion(double &ver);\n");
+    outs("\tvirtual bool getDefaultClientVersion(double &ver);\n");
 
     //Method ==> xslTransform
     if (needsXslt)
@@ -5116,7 +5119,7 @@ void EspServInfo::write_esp_binding_ipp()
     outs("};\n\n");
 }
 
-void EspServInfo::write_esp_binding()
+void EspServInfo::write_esp_binding(const char *packagename)
 {
     EspMethodInfo *mthi=NULL;
     int useMethodName = getMetaInt("use_method_name", 0);
@@ -5360,12 +5363,21 @@ void EspServInfo::write_esp_binding()
     outs("\treturn -1;\n");
     outs("}\n");
 
-    //method ==> getXsdDefinition
+
+    //method ==> getXmlFilename for xsd and wsdl transformations
+    outf("\nint C%sSoapBinding::getXmlFilename(StringBuffer &filename)\n", name_);
+    outs("{\n");
+    outf("\tfilename.append(\"%s.xml\");\n", packagename);
+    outs("\treturn 1;\n");
+    outs("}\n");
+
+    //method ==> getXsdDefinition  packagename is the base ecm filename
     outf("\nint C%sSoapBinding::getXsdDefinition(IEspContext &context, CHttpRequest* request, StringBuffer &content, const char *service, const char *method, bool mda)\n", name_);
     outs("{\n");
 
     outs("\tBoolHash added;\n");
 
+
     // version
     if (hasVersion)
     {
@@ -5374,6 +5386,9 @@ void EspServInfo::write_esp_binding()
     }
     outs("\tDBGLOG(\"Client version: %g\", context.getClientVersion());\n");
 
+    // getXSDDefinition(StringBuffer &content, const char *packageName, const char *serviceName, double version, const char *method);
+//    outf( "getXSDDefinition(content, \"%s\", \"%s\", context.getClientVersion(), method);\n\n", packagename, name_);
+
     indentReset(1);
     outf(1, "bool fullservice = (!Utils::strcasecmp(service, \"%s\"));\n", name_);
     indentOuts("bool allMethods = (method==NULL || *method==0);\n");
@@ -6626,7 +6641,7 @@ void HIDLcompiler::write_esp()
     EspServInfo *si;
     for (si=servs;si;si=si->next)
     {
-        si->write_esp_binding();
+        si->write_esp_binding(packagename);
         outs("\n\n");
         si->write_esp_service();
         outs("\n\n");
diff --git a/tools/hidl/hidlcomp.h b/tools/hidl/hidlcomp.h
index f2841bbd0a4..a78c530223a 100644
--- a/tools/hidl/hidlcomp.h
+++ b/tools/hidl/hidlcomp.h
@@ -1232,7 +1232,7 @@ class EspServInfo
     void write_client_interface();
     void write_factory_impl();
 
-    void write_esp_binding();
+    void write_esp_binding(const char *);
     void write_esp_binding_ipp();
     void write_esp_service_ipp();
     void write_esp_binding_ng_ipp(EspMessageInfo *);