diff --git a/publication-request.json b/publication-request.json
index 5d0ae19..2b0b115 100644
--- a/publication-request.json
+++ b/publication-request.json
@@ -1,7 +1,7 @@
 {
   "package-id" : "hl7.cql",
   "version": "1.5.2",
-  "path": "http://cql.hl7.org/N1/index.html",
+  "path": "http://cql.hl7.org/N1",
   "mode": "technical-correction",
   "status": "normative",
   "sequence": "Normative",
diff --git a/resources/ig-expansion-parameters.json b/resources/ig-expansion-parameters.json
new file mode 100644
index 0000000..37771e7
--- /dev/null
+++ b/resources/ig-expansion-parameters.json
@@ -0,0 +1 @@
+{"resourceType":"ImplementationGuide","id":"ig","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/igpublisher-folder-resource","valueString":"/Users/grahamegrieve/temp/igs/HL7-cql#master/resources"},{"url":"http://hl7.org/fhir/StructureDefinition/igpublisher-folder-pages","valueString":"/Users/grahamegrieve/temp/igs/HL7-cql#master/spec"}],"url":"http://cql.hl7.org/ImplementationGuide/ig","version":"1.5.2","name":"CQL","title":"Clinical Quality Language Specification","status":"active","experimental":false,"publisher":"Clinical Decision Support WG","contact":[{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/dss/index.cfm"}]}],"packageId":"hl7.cql","license":"CC0-1.0","fhirVersion":["4.0.1","4.0.1"],"definition":{"resource":[{"reference":{"reference":"Binary/binary-cql-grammar"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-annotated-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-annotated-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-debug-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-debug-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-usingcommon-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-usingcommon-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-usingcommon-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-common-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-common-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-common-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-usingcommon-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-usingcommon-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-usingcommon-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms135-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms135-qdm-json"}},{"reference":{"reference":"Binary/binary-example-cms135-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-cms146v2-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-cms146v2-cqm-json"}},{"reference":{"reference":"Binary/binary-example-cms146v2-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms146v2-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms146v2-qdm-json"}},{"reference":{"reference":"Binary/binary-example-cms146v2-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-cms154v1-nqf0069-cql"}},{"reference":{"reference":"Binary/binary-example-cms154v1-nqf0069-json"}},{"reference":{"reference":"Binary/binary-example-cms154v1-nqf0069-xml"}},{"reference":{"reference":"Binary/binary-example-cms179v2-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-cms179v2-cqm-json"}},{"reference":{"reference":"Binary/binary-example-cms179v2-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms179v2-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms179v2-qdm-json"}},{"reference":{"reference":"Binary/binary-example-cms179v2-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-cms26v2-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-cms26v2-cqm-json"}},{"reference":{"reference":"Binary/binary-example-cms26v2-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms55v1-nqf0495-cql"}},{"reference":{"reference":"Binary/binary-example-cms55v1-nqf0495-json"}},{"reference":{"reference":"Binary/binary-example-cms55v1-nqf0495-xml"}},{"reference":{"reference":"Binary/binary-example-cms55v1-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms55v1-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-example.relatedcontextretrieve-0.1.0-cql"}},{"reference":{"reference":"Binary/binary-example-example.relatedcontextretrieve-0.1.0-json"}},{"reference":{"reference":"Binary/binary-example-example.relatedcontextretrieve-0.1.0-xml"}},{"reference":{"reference":"Binary/binary-fhirpath-grammar"}},{"reference":{"reference":"Binary/binary-schema-clinicalexpression"}},{"reference":{"reference":"Binary/binary-schema-cqlannotations"}},{"reference":{"reference":"Binary/binary-schema-expression"}},{"reference":{"reference":"Binary/binary-schema-library"}},{"reference":{"reference":"Binary/binary-schema-modelinfo"}},{"reference":{"reference":"Binary/binary-schema-testschema"}},{"reference":{"reference":"Binary/binary-schema-types"}},{"reference":{"reference":"Binary/binary-test-cqlaggregatefunctionstest"}},{"reference":{"reference":"Binary/binary-test-cqlarithmeticfunctionstest"}},{"reference":{"reference":"Binary/binary-test-cqlcomparisonoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlconditionaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqldatetimeoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlerrorsandmessagingoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlintervaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqllistoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqllogicaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlnullologicaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlstringoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqltypeoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqltypestest"}},{"reference":{"reference":"Binary/binary-test-valueliteralsandselectors"}}],"page":{"sourceUrl":"index.html","name":"index.html","title":"CQL Specification","generation":"html"},"parameter":[{"code":{"code":"apply"},"value":"version"},{"code":{"code":"generate"},"value":"xml"},{"code":{"code":"generate"},"value":"JSON"}]}}
\ No newline at end of file
diff --git a/resources/ig-new.json b/resources/ig-new.json
new file mode 100644
index 0000000..f5e33c8
--- /dev/null
+++ b/resources/ig-new.json
@@ -0,0 +1,410 @@
+{
+  "resourceType" : "ImplementationGuide",
+  "id" : "ig",
+  "extension" : [{
+    "url" : "http://hl7.org/fhir/StructureDefinition/igpublisher-folder-resource",
+    "valueString" : "/Users/grahamegrieve/temp/igs/HL7-cql#master/resources"
+  },
+  {
+    "url" : "http://hl7.org/fhir/StructureDefinition/igpublisher-folder-pages",
+    "valueString" : "/Users/grahamegrieve/temp/igs/HL7-cql#master/spec"
+  }],
+  "url" : "http://cql.hl7.org/ImplementationGuide/ig",
+  "version" : "1.5.2",
+  "name" : "CQL",
+  "title" : "Clinical Quality Language Specification",
+  "status" : "active",
+  "experimental" : false,
+  "publisher" : "Clinical Decision Support WG",
+  "contact" : [{
+    "telecom" : [{
+      "system" : "url",
+      "value" : "http://www.hl7.org/Special/committees/dss/index.cfm"
+    }]
+  }],
+  "packageId" : "hl7.cql",
+  "license" : "CC0-1.0",
+  "fhirVersion" : ["4.0.1",
+  "4.0.1"],
+  "definition" : {
+    "resource" : [{
+      "reference" : {
+        "reference" : "Binary/binary-cql-grammar"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-annotated-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-annotated-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-debug-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-debug-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-usingcommon-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-usingcommon-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-usingcommon-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cds-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-common-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-common-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-common-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cqm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cqm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cqm-usingcommon-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cqm-usingcommon-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cqm-usingcommon-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-chlamydiascreening-cqm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms135-qdm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms135-qdm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms135-qdm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms146v2-cqm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms146v2-cqm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms146v2-cqm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms146v2-qdm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms146v2-qdm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms146v2-qdm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms154v1-nqf0069-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms154v1-nqf0069-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms154v1-nqf0069-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms179v2-cqm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms179v2-cqm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms179v2-cqm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms179v2-qdm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms179v2-qdm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms179v2-qdm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms26v2-cqm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms26v2-cqm-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms26v2-cqm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms55v1-nqf0495-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms55v1-nqf0495-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms55v1-nqf0495-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms55v1-qdm-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-cms55v1-qdm-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-example.relatedcontextretrieve-0.1.0-cql"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-example.relatedcontextretrieve-0.1.0-json"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-example-example.relatedcontextretrieve-0.1.0-xml"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-fhirpath-grammar"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-clinicalexpression"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-cqlannotations"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-expression"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-library"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-modelinfo"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-testschema"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-schema-types"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlaggregatefunctionstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlarithmeticfunctionstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlcomparisonoperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlconditionaloperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqldatetimeoperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlerrorsandmessagingoperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlintervaloperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqllistoperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqllogicaloperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlnullologicaloperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqlstringoperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqltypeoperatorstest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-cqltypestest"
+      }
+    },
+    {
+      "reference" : {
+        "reference" : "Binary/binary-test-valueliteralsandselectors"
+      }
+    }],
+    "page" : {
+      "sourceUrl" : "index.html",
+      "name" : "index.html",
+      "title" : "CQL Specification",
+      "generation" : "html"
+    },
+    "parameter" : [{
+      "code" : {
+        "code" : "apply"
+      },
+      "value" : "version"
+    },
+    {
+      "code" : {
+        "code" : "generate"
+      },
+      "value" : "xml"
+    },
+    {
+      "code" : {
+        "code" : "generate"
+      },
+      "value" : "JSON"
+    }]
+  }
+}
\ No newline at end of file
diff --git a/resources/ig-new.xml b/resources/ig-new.xml
new file mode 100644
index 0000000..2932861
--- /dev/null
+++ b/resources/ig-new.xml
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ImplementationGuide xmlns="http://hl7.org/fhir">
+  <id value="ig"/>
+  <extension url="http://hl7.org/fhir/StructureDefinition/igpublisher-folder-resource">
+    <valueString value="/Users/grahamegrieve/temp/igs/HL7-cql#master/resources"/>
+  </extension>
+  <extension url="http://hl7.org/fhir/StructureDefinition/igpublisher-folder-pages">
+    <valueString value="/Users/grahamegrieve/temp/igs/HL7-cql#master/spec"/>
+  </extension>
+  <url value="http://cql.hl7.org/ImplementationGuide/ig"/>
+  <version value="1.5.2"/>
+  <name value="CQL"/>
+  <title value="Clinical Quality Language Specification"/>
+  <status value="active"/>
+  <experimental value="false"/>
+  <publisher value="Clinical Decision Support WG"/>
+  <contact>
+    <telecom>
+      <system value="url"/>
+      <value value="http://www.hl7.org/Special/committees/dss/index.cfm"/>
+    </telecom>
+  </contact>
+  <packageId value="hl7.cql"/>
+  <license value="CC0-1.0"/>
+  <fhirVersion value="4.0.1"/>
+  <fhirVersion value="4.0.1"/>
+  <definition>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-cql-grammar"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-annotated-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-annotated-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-debug-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-debug-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-usingcommon-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-usingcommon-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-usingcommon-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cds-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-common-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-common-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-common-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cqm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cqm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cqm-usingcommon-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cqm-usingcommon-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cqm-usingcommon-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-chlamydiascreening-cqm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms135-qdm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms135-qdm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms135-qdm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms146v2-cqm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms146v2-cqm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms146v2-cqm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms146v2-qdm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms146v2-qdm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms146v2-qdm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms154v1-nqf0069-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms154v1-nqf0069-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms154v1-nqf0069-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms179v2-cqm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms179v2-cqm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms179v2-cqm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms179v2-qdm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms179v2-qdm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms179v2-qdm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms26v2-cqm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms26v2-cqm-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms26v2-cqm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms55v1-nqf0495-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms55v1-nqf0495-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms55v1-nqf0495-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms55v1-qdm-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-cms55v1-qdm-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-example.relatedcontextretrieve-0.1.0-cql"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-example.relatedcontextretrieve-0.1.0-json"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-example-example.relatedcontextretrieve-0.1.0-xml"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-fhirpath-grammar"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-clinicalexpression"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-cqlannotations"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-expression"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-library"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-modelinfo"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-testschema"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-schema-types"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlaggregatefunctionstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlarithmeticfunctionstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlcomparisonoperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlconditionaloperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqldatetimeoperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlerrorsandmessagingoperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlintervaloperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqllistoperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqllogicaloperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlnullologicaloperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqlstringoperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqltypeoperatorstest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-cqltypestest"/>
+      </reference>
+    </resource>
+    <resource>
+      <reference>
+        <reference value="Binary/binary-test-valueliteralsandselectors"/>
+      </reference>
+    </resource>
+    <page>
+      <sourceUrl value="index.html"/>
+      <name value="index.html"/>
+      <title value="CQL Specification"/>
+      <generation value="html"/>
+    </page>
+    <parameter>
+      <code>
+        <code value="apply"/>
+      </code>
+      <value value="version"/>
+    </parameter>
+    <parameter>
+      <code>
+        <code value="generate"/>
+      </code>
+      <value value="xml"/>
+    </parameter>
+    <parameter>
+      <code>
+        <code value="generate"/>
+      </code>
+      <value value="JSON"/>
+    </parameter>
+  </definition>
+</ImplementationGuide>
\ No newline at end of file
diff --git a/resources/ig-validation-parameters.json b/resources/ig-validation-parameters.json
new file mode 100644
index 0000000..37771e7
--- /dev/null
+++ b/resources/ig-validation-parameters.json
@@ -0,0 +1 @@
+{"resourceType":"ImplementationGuide","id":"ig","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/igpublisher-folder-resource","valueString":"/Users/grahamegrieve/temp/igs/HL7-cql#master/resources"},{"url":"http://hl7.org/fhir/StructureDefinition/igpublisher-folder-pages","valueString":"/Users/grahamegrieve/temp/igs/HL7-cql#master/spec"}],"url":"http://cql.hl7.org/ImplementationGuide/ig","version":"1.5.2","name":"CQL","title":"Clinical Quality Language Specification","status":"active","experimental":false,"publisher":"Clinical Decision Support WG","contact":[{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/dss/index.cfm"}]}],"packageId":"hl7.cql","license":"CC0-1.0","fhirVersion":["4.0.1","4.0.1"],"definition":{"resource":[{"reference":{"reference":"Binary/binary-cql-grammar"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-annotated-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-annotated-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-debug-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-debug-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-usingcommon-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-usingcommon-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-usingcommon-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cds-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-common-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-common-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-common-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-usingcommon-cql"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-usingcommon-json"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-usingcommon-xml"}},{"reference":{"reference":"Binary/binary-example-chlamydiascreening-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms135-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms135-qdm-json"}},{"reference":{"reference":"Binary/binary-example-cms135-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-cms146v2-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-cms146v2-cqm-json"}},{"reference":{"reference":"Binary/binary-example-cms146v2-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms146v2-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms146v2-qdm-json"}},{"reference":{"reference":"Binary/binary-example-cms146v2-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-cms154v1-nqf0069-cql"}},{"reference":{"reference":"Binary/binary-example-cms154v1-nqf0069-json"}},{"reference":{"reference":"Binary/binary-example-cms154v1-nqf0069-xml"}},{"reference":{"reference":"Binary/binary-example-cms179v2-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-cms179v2-cqm-json"}},{"reference":{"reference":"Binary/binary-example-cms179v2-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms179v2-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms179v2-qdm-json"}},{"reference":{"reference":"Binary/binary-example-cms179v2-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-cms26v2-cqm-cql"}},{"reference":{"reference":"Binary/binary-example-cms26v2-cqm-json"}},{"reference":{"reference":"Binary/binary-example-cms26v2-cqm-xml"}},{"reference":{"reference":"Binary/binary-example-cms55v1-nqf0495-cql"}},{"reference":{"reference":"Binary/binary-example-cms55v1-nqf0495-json"}},{"reference":{"reference":"Binary/binary-example-cms55v1-nqf0495-xml"}},{"reference":{"reference":"Binary/binary-example-cms55v1-qdm-cql"}},{"reference":{"reference":"Binary/binary-example-cms55v1-qdm-xml"}},{"reference":{"reference":"Binary/binary-example-example.relatedcontextretrieve-0.1.0-cql"}},{"reference":{"reference":"Binary/binary-example-example.relatedcontextretrieve-0.1.0-json"}},{"reference":{"reference":"Binary/binary-example-example.relatedcontextretrieve-0.1.0-xml"}},{"reference":{"reference":"Binary/binary-fhirpath-grammar"}},{"reference":{"reference":"Binary/binary-schema-clinicalexpression"}},{"reference":{"reference":"Binary/binary-schema-cqlannotations"}},{"reference":{"reference":"Binary/binary-schema-expression"}},{"reference":{"reference":"Binary/binary-schema-library"}},{"reference":{"reference":"Binary/binary-schema-modelinfo"}},{"reference":{"reference":"Binary/binary-schema-testschema"}},{"reference":{"reference":"Binary/binary-schema-types"}},{"reference":{"reference":"Binary/binary-test-cqlaggregatefunctionstest"}},{"reference":{"reference":"Binary/binary-test-cqlarithmeticfunctionstest"}},{"reference":{"reference":"Binary/binary-test-cqlcomparisonoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlconditionaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqldatetimeoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlerrorsandmessagingoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlintervaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqllistoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqllogicaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlnullologicaloperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqlstringoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqltypeoperatorstest"}},{"reference":{"reference":"Binary/binary-test-cqltypestest"}},{"reference":{"reference":"Binary/binary-test-valueliteralsandselectors"}}],"page":{"sourceUrl":"index.html","name":"index.html","title":"CQL Specification","generation":"html"},"parameter":[{"code":{"code":"apply"},"value":"version"},{"code":{"code":"generate"},"value":"xml"},{"code":{"code":"generate"},"value":"JSON"}]}}
\ No newline at end of file
diff --git a/resources/ig.xml b/resources/ig.xml
index 8421846..35396a5 100644
--- a/resources/ig.xml
+++ b/resources/ig.xml
@@ -3,7 +3,7 @@
 <ImplementationGuide xmlns="http://hl7.org/fhir">
   <id value="ig"/>
   <url value="http://cql.hl7.org/ImplementationGuide/ig"/>
-  <version value="1.5.1"/>
+  <version value="1.5.2"/>
   <name value="CQL"/>
   <title value="Clinical Quality Language Specification"/>
   <status value="active"/>