diff --git a/scripts/common.xsl b/scripts/common.xsl
index f531204..fb919a2 100644
--- a/scripts/common.xsl
+++ b/scripts/common.xsl
@@ -67,14 +67,18 @@
     <xsl:variable name="lang" select="fn:getConfig('lang')"/>
     <xsl:variable name="uriThingSeparator" select="fn:getConfig('uriThingSeparator')"/>
     <xsl:variable name="uriDimensionSeparator" select="fn:getConfig('uriDimensionSeparator')"/>
+    <xsl:variable name="property" select="fn:getConfig('property')"/>
+    <xsl:variable name="dimension" select="fn:getConfig('dimension')"/>
+    <xsl:variable name="measure" select="fn:getConfig('measure')"/>
+    <xsl:variable name="attribute" select="fn:getConfig('attribute')"/>
+    <xsl:variable name="useSeparateProperties" select="fn:getConfig('useSeparateProperties')"/>
     <xsl:variable name="provenance" select="concat('provenance', $uriThingSeparator)"/>
     <xsl:variable name="concept" select="'concept/'"/>
     <xsl:variable name="code" select="'code/'"/>
     <xsl:variable name="class" select="'class/'"/>
-    <xsl:variable name="property" select="concat($agencyURI, 'property', $uriThingSeparator)"/>
     <xsl:variable name="dataset" select="'dataset/'"/>
     <xsl:variable name="structure" select="'structure/'"/>
-    <xsl:variable name="slice" select="concat('slice', $uriThingSeparator)"/>
+    <xsl:variable name="slice" select="'slice/'"/>
     <xsl:variable name="component" select="'component/'"/>
 
     <xsl:template name="langTextNode">
@@ -157,29 +161,26 @@
     </xsl:template>
 
     <xsl:template name="qbCodeListrdfsRange">
-        <xsl:param name="SeriesKeyConceptsData" tunnel="yes"/>
+        <xsl:param name="concept" tunnel="yes"/>
 
-        <xsl:variable name="codelist" select="@codelist"/>
+        <xsl:variable name="codelist" select="$concept/@codelist"/>
+        <xsl:variable name="codelistVersion" select="$concept/@codelistVersion"/>
+        <xsl:variable name="codelistAgency" select="$concept/@codelistAgency"/>
 
-        <xsl:if test="$codelist">
-            <xsl:variable name="codelistVersion" select="@codelistVersion"/>
-            <xsl:variable name="codelistAgency" select="$SeriesKeyConceptsData/@codelistAgency"/>
-
-            <xsl:choose>
-                <xsl:when test="lower-case(normalize-space($codelistAgency)) = 'sdmx'">
-                    <xsl:variable name="codelistNormalized" select="fn:normalizeSDMXCodeListID($codelist)"/>
+        <xsl:choose>
+            <xsl:when test="lower-case(normalize-space($codelistAgency)) = 'sdmx'">
+                <xsl:variable name="codelistNormalized" select="fn:normalizeSDMXCodeListID($codelist)"/>
 
-                    <xsl:variable name="SDMXConceptScheme" select="$SDMXCode/skos:ConceptScheme[skos:notation = $codelistNormalized][1]"/>
+                <xsl:variable name="SDMXConceptScheme" select="$SDMXCode/skos:ConceptScheme[skos:notation = $codelistNormalized][1]"/>
 
-                    <qb:codeList rdf:resource="{$SDMXConceptScheme/@rdf:about}"/>
-                    <rdfs:range rdf:resource="{$SDMXConceptScheme/rdfs:seeAlso[1]/@rdf:resource}"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <qb:codeList rdf:resource="{fn:getComponentURI('code', $codelistAgency)}/{fn:getVersion($codelistVersion)}/{$codelist}"/>
-                    <rdfs:range rdf:resource="{fn:getComponentURI('class', $codelistAgency)}/{fn:getVersion($codelistVersion)}/{$codelist}"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:if>
+                <qb:codeList rdf:resource="{$SDMXConceptScheme/@rdf:about}"/>
+                <rdfs:range rdf:resource="{$SDMXConceptScheme/rdfs:seeAlso[1]/@rdf:resource}"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <qb:codeList rdf:resource="{fn:getComponentBase('code', $codelistAgency)}/{fn:getVersion($codelistVersion)}/{$codelist}"/>
+                <rdfs:range rdf:resource="{fn:getComponentBase('class', $codelistAgency)}/{fn:getVersion($codelistVersion)}/{$codelist}"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <xsl:function name="fn:getAgencyURI">
@@ -193,12 +194,11 @@
     </xsl:function>
 
     <xsl:function name="fn:getAgencyBase">
-        <xsl:param name="node"/>
+        <xsl:param name="agency"/>
 
-        <xsl:variable name="uri" select="fn:getAgencyURI($node/@agencyID)"/>
+        <xsl:variable name="uri" select="fn:getAgencyURI($agency)"/>
         <xsl:choose>
             <xsl:when test="$uri = '' or $uri = $agencyURI">
-                <xsl:value-of select="$agencyURI"/>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="$uri"/>
@@ -207,7 +207,7 @@
     </xsl:function>
 
 
-    <xsl:function name="fn:getComponentURI">
+    <xsl:function name="fn:getComponentBase">
         <xsl:param name="component"/>
         <xsl:param name="agency"/>
 
@@ -535,26 +535,33 @@ TODO: Timespan, Count, InclusiveValueRange, ExclusiveValueRange, Incremental, Ob
         <xsl:param name="KeyFamilyRef"/>
 
         <rdf:RDF>
-            <xsl:for-each select="distinct-values($concepts)">
-                <xsl:variable name="conceptRef" select="."/>
+            <xsl:for-each select="$concepts">
+                <xsl:variable name="conceptRef" select="@conceptRef"/>
 
                 <xsl:element name="{$conceptRef}">
-                    <xsl:variable name="Component" select="$genericStructure/*[local-name() = 'KeyFamilies']/structure:KeyFamily[@id = $KeyFamilyRef]/structure:Components/*[@conceptRef = $conceptRef][1]"/>
+<!--                    <xsl:variable name="Component" select="$genericStructure/*[local-name() = 'KeyFamilies']/structure:KeyFamily[@id = $KeyFamilyRef]/structure:Components/*[@conceptRef = $conceptRef][1]"/>-->
 
-                    <xsl:attribute name="component">
-                        <xsl:value-of select="$Component/local-name()"/>
+                    <xsl:variable name="componentType">
+                        <xsl:value-of select="local-name()"/>
+                    </xsl:variable>
+                    <xsl:attribute name="componentType">
+                        <xsl:value-of select="$componentType"/>
                     </xsl:attribute>
 
                     <xsl:attribute name="conceptRole">
-                        <xsl:value-of select="fn:getConceptRole($Component)"/>
+                        <xsl:value-of select="fn:getConceptRole(.)"/>
                     </xsl:attribute>
 
-                    <xsl:variable name="codelist" select="$Component/@codelist"/>
+                    <xsl:variable name="codelist" select="@codelist"/>
                     <xsl:attribute name="codelist">
                         <xsl:value-of select="$codelist"/>
                     </xsl:attribute>
 
-                    <xsl:variable name="codelistAgency" select="fn:getCodeListAgencyID($genericStructure, $Component)"/>
+                    <xsl:variable name="codelistAgency" select="fn:getCodeListAgencyID($genericStructure, .)"/>
+<!--<xsl:message>-->
+<!--<xsl:value-of select="$codelistAgency"/>-->
+<!--</xsl:message>-->
+
 
                     <xsl:attribute name="codelistAgency">
                         <xsl:value-of select="$codelistAgency"/>
@@ -562,8 +569,8 @@ TODO: Timespan, Count, InclusiveValueRange, ExclusiveValueRange, Incremental, Ob
 
                     <xsl:attribute name="codelistVersion">
                         <xsl:choose>
-                            <xsl:when test="$Component/@codelistVersion">
-                                <xsl:value-of select="$Component/@codelistVersion"/>
+                            <xsl:when test="@codelistVersion">
+                                <xsl:value-of select="@codelistVersion"/>
                             </xsl:when>
                             <xsl:otherwise>
                                 <xsl:value-of select="fn:getVersion($genericStructure/*[local-name() = 'CodeLists']//structure:CodeList[@id = $codelist and @agencyID = $codelistAgency]/@version)"/>
@@ -572,13 +579,13 @@ TODO: Timespan, Count, InclusiveValueRange, ExclusiveValueRange, Incremental, Ob
                     </xsl:attribute>
 
                     <xsl:variable name="conceptAgency">
-                        <xsl:value-of select="fn:getConceptAgencyID($genericStructure, $Component)"/>
+                        <xsl:value-of select="fn:getConceptAgencyID($genericStructure, .)"/>
                     </xsl:variable>
                     <xsl:attribute name="conceptAgency">
                         <xsl:value-of select="$conceptAgency"/>
                     </xsl:attribute>
 
-                    <xsl:variable name="conceptSchemeRef" select="$Component/@conceptSchemeRef"/>
+                    <xsl:variable name="conceptSchemeRef" select="@conceptSchemeRef"/>
                     <xsl:variable name="conceptScheme">
                         <xsl:choose>
                             <xsl:when test="$conceptSchemeRef">
@@ -594,7 +601,7 @@ TODO: Timespan, Count, InclusiveValueRange, ExclusiveValueRange, Incremental, Ob
                         <xsl:value-of select="$conceptScheme"/>
                     </xsl:attribute>
 
-                    <xsl:variable name="conceptSchemePath">                    
+                    <xsl:variable name="conceptSchemePath">
                         <xsl:if test="$conceptScheme != ''">
                             <xsl:value-of select="concat('/', $conceptScheme)"/>
                         </xsl:if>
@@ -602,8 +609,8 @@ TODO: Timespan, Count, InclusiveValueRange, ExclusiveValueRange, Incremental, Ob
 
                     <xsl:variable name="conceptVersion">
                         <xsl:choose>
-                            <xsl:when test="$Component/@conceptVersion">
-                                <xsl:value-of select="$Component/@conceptVersion"/>
+                            <xsl:when test="@conceptVersion">
+                                <xsl:value-of select="@conceptVersion"/>
                             </xsl:when>
                             <xsl:otherwise>
 <!--
@@ -617,7 +624,9 @@ TODO: This should probably get the version from ConceptScheme just as the struct
                         <xsl:value-of select="$conceptVersion"/>
                     </xsl:attribute>
 
-                    <xsl:variable name="conceptPath" select="concat($conceptVersion, $conceptSchemePath, $uriThingSeparator, $conceptRef)"/>
+                    <xsl:variable name="conceptPathWOConceptRef" select="concat($conceptVersion, $conceptSchemePath)"/>
+
+                    <xsl:variable name="conceptPath" select="concat($conceptPathWOConceptRef, $uriThingSeparator, $conceptRef)"/>
                     <xsl:attribute name="conceptPath">
                         <xsl:value-of select="$conceptPath"/>
                     </xsl:attribute>
@@ -627,18 +636,74 @@ TODO: This should probably get the version from ConceptScheme just as the struct
                         <xsl:value-of select="$conceptURI"/>
                     </xsl:attribute>
 
+                    <xsl:variable name="propertyType" select="fn:getPropertyType($componentType)"/>
+                    <xsl:attribute name="propertyType">
+                        <xsl:value-of select="$propertyType"/>
+                    </xsl:attribute>
+
+                    <xsl:variable name="componentBase" select="fn:getComponentBase($propertyType, $conceptAgency)"/>
+                    <xsl:variable name="propertyNamespace">
+                        <xsl:choose>
+                            <xsl:when test="$useSeparateProperties = 'true'">
+                                <xsl:choose>
+                                    <xsl:when test="$componentBase = $propertyType">
+                                        <xsl:value-of select="concat($agencyURI, $componentBase, '/', $conceptPathWOConceptRef, $uriThingSeparator)"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:value-of select="concat($componentBase, '/', $conceptPathWOConceptRef, $uriThingSeparator)"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <!-- TODO: -->
+                                <xsl:value-of select="$property"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:variable>
+                    <xsl:attribute name="propertyNamespace">
+                        <xsl:value-of select="$propertyNamespace"/>
+                    </xsl:attribute>
+
+                    <xsl:variable name="componentProperty">
+                        <xsl:value-of select="concat($componentBase, '/', $conceptPath)"/>
+                    </xsl:variable>
                     <xsl:attribute name="componentProperty">
-                        <xsl:value-of select="concat(fn:getComponentURI('property', $conceptAgency), '/', $conceptPath)"/>
+                        <xsl:value-of select="$componentProperty"/>
                     </xsl:attribute>
 
                     <xsl:attribute name="datatype">
-                        <xsl:value-of select="fn:getXSDType($Component/structure:TextFormat/@textType)"/>
+                        <xsl:value-of select="fn:getXSDType(structure:TextFormat/@textType)"/>
                     </xsl:attribute>
                 </xsl:element>
             </xsl:for-each>
         </rdf:RDF>
     </xsl:function>
 
+    <xsl:function name="fn:getPropertyType">
+        <xsl:param name="componentType"/>
+
+        <xsl:choose>
+            <xsl:when test="$useSeparateProperties = 'true'">
+                <xsl:choose>
+                    <xsl:when test="$componentType = 'Dimension' or $componentType = 'TimeDimension'">
+                        <xsl:value-of select="'dimension'"/>
+                    </xsl:when>
+                    <xsl:when test="$componentType = 'PrimaryMeasure'">
+                        <xsl:value-of select="'measure'"/>
+                    </xsl:when>
+                    <xsl:when test="$componentType = 'Attribute'">
+                        <xsl:value-of select="'attribute'"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="'property'"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
     <xsl:function name="fn:getConceptRole">
         <xsl:param name="node"/>
 
diff --git a/scripts/config.rdf b/scripts/config.rdf
index 6fc2348..82cc0f3 100644
--- a/scripts/config.rdf
+++ b/scripts/config.rdf
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
   <rdf:Description rdf:about="file:///var/www/linked-sdmx/scripts/config.ttl">
     <rdf:value>
       <rdf:Description>
-        <rdf:value>https://raw.github.com/csarven/linked-sdmx/master/scripts/generic.xsl</rdf:value>
-        <rdfs:label>xslDocument</rdfs:label>
+        <rdf:value>http://purl.org/linked-data/xkos#</rdf:value>
+        <rdfs:label>xkos</rdfs:label>
+      </rdf:Description>
+    </rdf:value>
+    <rdf:value>
+      <rdf:Description>
+        <rdf:value>http://purl.org/linked-data/sdmx#</rdf:value>
+        <rdfs:label>sdmx</rdfs:label>
       </rdf:Description>
     </rdf:value>
     <rdf:value>
@@ -65,8 +70,26 @@
     </rdf:value>
     <rdf:value>
       <rdf:Description>
-        <rdf:value>http://www.w3.org/1999/02/22-rdf-syntax-ns#</rdf:value>
-        <rdfs:label>rdf</rdfs:label>
+        <rdf:value>http://example.org/dimension/</rdf:value>
+        <rdfs:label>dimension</rdfs:label>
+      </rdf:Description>
+    </rdf:value>
+    <rdf:value>
+      <rdf:Description>
+        <rdf:value>http://example.org/measure/</rdf:value>
+        <rdfs:label>measure</rdfs:label>
+      </rdf:Description>
+    </rdf:value>
+    <rdf:value>
+      <rdf:Description>
+        <rdf:value>http://example.org/attribute/</rdf:value>
+        <rdfs:label>attribute</rdfs:label>
+      </rdf:Description>
+    </rdf:value>
+    <rdf:value>
+      <rdf:Description>
+        <rdf:value>true</rdf:value>
+        <rdfs:label>useSeparateProperties</rdfs:label>
       </rdf:Description>
     </rdf:value>
     <rdf:value>
@@ -76,7 +99,7 @@
             <rdf:predicate>xkos:hasPart</rdf:predicate>
             <rdf:type>CODE_OFS</rdf:type>
             <rdfs:label>AnnotationText</rdfs:label>
-            <rdfs:range>http://example.org/code/CL_HGDE_GDE</rdfs:range>
+            <rdfs:range>http://example.org/code/1.0/CL_HGDE_GDE</rdfs:range>
           </rdf:Description>
         </rdf:value>
         <rdf:value>
@@ -84,7 +107,7 @@
             <rdf:predicate>xkos:isPartOf</rdf:predicate>
             <rdf:type>CODE_HISTORY</rdf:type>
             <rdfs:label>AnnotationText</rdfs:label>
-            <rdfs:range>http://example.org/code/CL_HGDE_GDE</rdfs:range>
+            <rdfs:range>http://example.org/code/1.0/CL_HGDE_GDE</rdfs:range>
           </rdf:Description>
         </rdf:value>
         <rdf:value>
@@ -100,12 +123,35 @@
             <rdf:predicate>property:GDE_GARTE</rdf:predicate>
             <rdf:type>REC_TYPE</rdf:type>
             <rdfs:label>AnnotationTitle</rdfs:label>
-            <rdfs:range>http://example.org/code/CL_HGDE_MODALITY</rdfs:range>
+            <rdfs:range>http://example.org/code/1.0/CL_HGDE_MODALITY</rdfs:range>
           </rdf:Description>
         </rdf:value>
         <rdfs:label>interlinkAnnotationTypes</rdfs:label>
       </rdf:Description>
     </rdf:value>
+    <rdf:value>
+      <rdf:Description>
+        <rdf:value>
+          <rdf:Description>
+            <rdf:value>https://github.com/csarven/linked-sdmx</rdf:value>
+            <rdfs:label>URI</rdfs:label>
+          </rdf:Description>
+        </rdf:value>
+        <rdf:value>
+          <rdf:Description>
+            <rdf:value>http://csarven.ca/linked-sdmx-data</rdf:value>
+            <rdfs:label>seeAlso</rdfs:label>
+          </rdf:Description>
+        </rdf:value>
+        <rdfs:label>LinkedSDMX</rdfs:label>
+      </rdf:Description>
+    </rdf:value>
+    <rdf:value>
+      <rdf:Description>
+        <rdf:value>http://www.w3.org/1999/02/22-rdf-syntax-ns#</rdf:value>
+        <rdfs:label>rdf</rdfs:label>
+      </rdf:Description>
+    </rdf:value>
     <rdf:value>
       <rdf:Description>
         <rdf:value>http://www.w3.org/2000/01/rdf-schema#</rdf:value>
@@ -136,17 +182,5 @@
         <rdfs:label>skos</rdfs:label>
       </rdf:Description>
     </rdf:value>
-    <rdf:value>
-      <rdf:Description>
-        <rdf:value>http://purl.org/linked-data/xkos#</rdf:value>
-        <rdfs:label>xkos</rdfs:label>
-      </rdf:Description>
-    </rdf:value>
-    <rdf:value>
-      <rdf:Description>
-        <rdf:value>http://purl.org/linked-data/sdmx#</rdf:value>
-        <rdfs:label>sdmx</rdfs:label>
-      </rdf:Description>
-    </rdf:value>
   </rdf:Description>
 </rdf:RDF>
diff --git a/scripts/generic.xsl b/scripts/generic.xsl
index 23be764..f0216f3 100644
--- a/scripts/generic.xsl
+++ b/scripts/generic.xsl
@@ -50,8 +50,6 @@
 
     <xsl:template match="/">
         <rdf:RDF xml:base="{$agencyURI}">
-            <xsl:namespace name="property" select="$property"/>
-
             <xsl:call-template name="provenanceInit"/>
 
             <xsl:for-each select="Structure | RegistryInterface/QueryStructureResponse">
@@ -125,7 +123,7 @@ FIXME: $pathToGenericStructure should be replaced with an HTTP URI ??? Is this i
     <xsl:template name="structureComponents">
         <xsl:param name="KeyFamilyID" tunnel="yes"/>
 
-        <xsl:variable name="concepts" select="distinct-values(structure:Components/*/@conceptRef)"/>
+        <xsl:variable name="concepts" select="structure:Components/*[@conceptRef]"/>
 
         <xsl:variable name="SeriesKeyConceptsData" select="fn:createSeriesKeyComponentData($concepts, $KeyFamilyID)"/>
 
@@ -135,17 +133,19 @@ FIXME: This could reuse the agencyID that's determined from SeriesKeyConceptsDat
 -->
             <xsl:variable name="agencyID" select="fn:getConceptAgencyID(/Structure,.)"/>
             <qb:component>
+                <xsl:variable name="propertyType" select="fn:getPropertyType(local-name())"/>
+
                 <xsl:variable name="conceptRef" select="@conceptRef"/>
 
-                <xsl:variable name="conceptPath" select="$SeriesKeyConceptsData/*[name() = $conceptRef]/@conceptPath"/>
+                <xsl:variable name="conceptPath" select="$SeriesKeyConceptsData/*[name() = $conceptRef and @propertyType = $propertyType]/@conceptPath"/>
 
-                <xsl:variable name="conceptURI" select="$SeriesKeyConceptsData/*[name() = $conceptRef]/@conceptURI"/>
+                <xsl:variable name="conceptURI" select="$SeriesKeyConceptsData/*[name() = $conceptRef and @propertyType = $propertyType]/@conceptURI"/>
 
                 <xsl:variable name="Concept" select="//*[local-name() = 'Concepts']//structure:Concept[@id = $conceptRef]"/>
 
-                <xsl:variable name="componentProperty" select="$SeriesKeyConceptsData/*[name() = $conceptRef]/@componentProperty"/>
+                <xsl:variable name="componentProperty" select="$SeriesKeyConceptsData/*[name() = $conceptRef and @propertyType = $propertyType]/@componentProperty"/>
 
-                <rdf:Description rdf:about="{$component}{$KeyFamilyID}{$uriThingSeparator}{$conceptPath}">
+                <rdf:Description rdf:about="{$component}{$KeyFamilyID}/{$propertyType}/{$conceptPath}">
                     <rdf:type rdf:resource="{$qb}ComponentSpecification"/>
                     <qb:componentProperty rdf:resource="{$componentProperty}"/>
 
@@ -167,7 +167,7 @@ Should we give any special treatment to TimeDimension even though qb currently d
                                         </rdf:Description>
                                     </qb:concept>
                                     <xsl:call-template name="qbCodeListrdfsRange">
-                                        <xsl:with-param name="SeriesKeyConceptsData" select="$SeriesKeyConceptsData/*[name() = $conceptRef]" tunnel="yes"/>
+                                        <xsl:with-param name="concept" select="$SeriesKeyConceptsData/*[name() = $conceptRef and @propertyType = $propertyType]" tunnel="yes"/>
                                     </xsl:call-template>
                                     <xsl:call-template name="ConceptLabels">
                                         <xsl:with-param name="Concept" select="$Concept"/>
@@ -228,7 +228,7 @@ Multiple measures
                                         </rdf:Description>
                                     </qb:concept>
                                     <xsl:call-template name="qbCodeListrdfsRange">
-                                        <xsl:with-param name="SeriesKeyConceptsData" select="$SeriesKeyConceptsData/*[name() = $conceptRef]" tunnel="yes"/>
+                                        <xsl:with-param name="concept" select="$SeriesKeyConceptsData/*[name() = $conceptRef and @propertyType = $propertyType]" tunnel="yes"/>
                                     </xsl:call-template>
                                     <xsl:call-template name="ConceptLabels">
                                         <xsl:with-param name="Concept" select="$Concept"/>
@@ -279,7 +279,7 @@ FIXME: Is this somehow for qb:Dimension?
 
                     <xsl:for-each select="structure:DimensionRef">
                         <xsl:variable name="conceptRef" select="normalize-space(.)"/>
-                        <qb:componentProperty rdf:resource="{$SeriesKeyConceptsData/*[name() = $conceptRef]/@componentProperty}"/>
+                        <qb:componentProperty rdf:resource="{$SeriesKeyConceptsData/*[name() = $conceptRef and @propertyType = 'dimension']/@componentProperty}"/>
                     </xsl:for-each>
                 </rdf:Description>
             </qb:sliceKey>
@@ -304,7 +304,7 @@ Check where to get ConceptScheme
 
     <xsl:template name="structureConceptScheme">
         <xsl:variable name="version" select="fn:getVersion(@version)"/>
-        <xsl:variable name="conceptSchemeURI" select="concat(fn:getAgencyBase(.), $concept, $version, '/', @id)"/>
+        <xsl:variable name="conceptSchemeURI" select="concat(fn:getAgencyBase(@agencyID), $concept, $version, '/', @id)"/>
 
         <xsl:call-template name="provenance">
             <xsl:with-param name="provUsedA" select="resolve-uri(tokenize($xmlDocument, '/')[last()], $xmlDocumentBaseUri)"/>
@@ -352,7 +352,7 @@ XXX: Is it possible to have a Concept version that's different than the version
                     <xsl:value-of select="concat($conceptSchemeURI, $uriThingSeparator, @id)"/>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:value-of select="concat(fn:getAgencyBase(.), $concept, $version, '/', @id)"/>
+                    <xsl:value-of select="concat(fn:getAgencyBase(@agencyID), $concept, $version, $uriThingSeparator, @id)"/>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
@@ -670,7 +670,7 @@ XXX: Fallback: KeyFamilyRef may not exist. But this is inaccurate if there are m
 
                 <xsl:variable name="KeyFamilyAgencyID" select="$genericStructure/*[local-name() = 'KeyFamilies']/structure:KeyFamily[@id = $KeyFamilyRef]/@agencyID"/>
 
-                <xsl:variable name="concepts" select="distinct-values($KeyFamily/structure:Components/*/@conceptRef)"/>
+                <xsl:variable name="concepts" select="$KeyFamily/structure:Components/*[@conceptRef]"/>
 
                 <xsl:variable name="TimeDimensionConceptRef" select="distinct-values($KeyFamily/structure:Components/structure:TimeDimension/@conceptRef)"/>
 
@@ -807,10 +807,11 @@ Use FrequencyDimension="true" from KeyFamily Component
                                 <rdf:Description rdf:about="{$slice}{$KeyFamilyRef}{$uriThingSeparator}{$SeriesKeyValuesURI}">
                                     <rdf:type rdf:resource="{$qb}Slice"/>
                                     <qb:sliceStructure rdf:resource="{concat($slice, $KeyFamilyRef, $uriThingSeparator, $Group/@id)}"/>
+
                                     <xsl:for-each select="$ValuesWOFreq">
                                         <xsl:variable name="concept" select="@concept"/>
                                         <xsl:call-template name="ObsProperty">
-                                            <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                            <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'dimension' or @propertyType = 'property')]"/>
                                             <xsl:with-param name="value" select="@value"/>
                                         </xsl:call-template>
                                     </xsl:for-each>
@@ -856,7 +857,7 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
 
                             <xsl:if test="not(contains($omitComponents, lower-case($concept)))">
                                 <xsl:call-template name="ObsProperty">
-                                    <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                    <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'attribute' or @propertyType = 'property')]"/>
                                     <xsl:with-param name="value" select="@value"/>
                                 </xsl:call-template>
                             </xsl:if>
@@ -878,13 +879,13 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                             <xsl:for-each select="$Values">
                                 <xsl:variable name="concept" select="@concept"/>
                                 <xsl:call-template name="ObsProperty">
-                                    <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                    <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'dimension' or @propertyType = 'property')]"/>
                                     <xsl:with-param name="value" select="@value"/>
                                 </xsl:call-template>
                             </xsl:for-each>
 
                             <xsl:if test="$ObsTime != '' and $TimeDimensionConceptRef != ''">
-                                <xsl:element name="property:{$TimeDimensionConceptRef}" namespace="{$property}{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]}">
+                                <xsl:element name="{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]/@propertyType}:{$TimeDimensionConceptRef}" namespace="{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]/@propertyNamespace}{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]}">
 
                                     <xsl:variable name="resourceRefPeriod" select="fn:getResourceRefPeriod($ObsTime)"/>
 
@@ -908,7 +909,7 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                             </xsl:if>
 
                             <xsl:for-each select="generic:ObsValue">
-                                <xsl:element name="property:{$PrimaryMeasureConceptRef}" namespace="{$property}{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]}">
+                                <xsl:element name="{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]/@propertyType}:{$PrimaryMeasureConceptRef}" namespace="{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]/@propertyNamespace}{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]}">
                                     <xsl:variable name="datatype" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($PrimaryMeasureConceptRef)]/@datatype"/>
                                     <xsl:choose>
                                         <xsl:when test="$datatype != ''">
@@ -932,7 +933,7 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
 
                                 <xsl:if test="not(contains($omitComponents, lower-case($concept)))">
                                     <xsl:call-template name="ObsProperty">
-                                        <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                        <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'attribute' or @propertyType = 'property')]"/>
                                         <xsl:with-param name="value" select="@value"/>
                                     </xsl:call-template>
                                 </xsl:if>
@@ -970,10 +971,11 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                                 <rdf:Description rdf:about="{$slice}{$KeyFamilyRef}{$uriThingSeparator}{$SeriesKeyValuesURI}">
                                     <rdf:type rdf:resource="{$qb}Slice"/>
                                     <qb:sliceStructure rdf:resource="{concat($slice, $KeyFamilyRef, $uriThingSeparator, $Group/@id)}"/>
+
                                     <xsl:for-each select="$ValuesWOFreq">
                                         <xsl:variable name="concept" select="@concept"/>
                                         <xsl:call-template name="ObsProperty">
-                                            <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                            <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'dimension' or @propertyType = 'property')]"/>
                                             <xsl:with-param name="value" select="@value"/>
                                         </xsl:call-template>
                                     </xsl:for-each>
@@ -1003,13 +1005,14 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                     </xsl:variable>
 
                     <xsl:variable name="CompactAttributes">
+
                         <xsl:for-each select="@*">
                             <xsl:variable name="concept" select="name()"/>
 
                             <xsl:if test="$SeriesKeyConceptsData/*[@component = 'Attribute' and local-name() = $concept]">
                                 <xsl:if test="not(contains($omitComponents, lower-case($concept)))">
                                     <xsl:call-template name="ObsProperty">
-                                        <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                        <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'attribute' or @propertyType = 'property')]"/>
                                         <xsl:with-param name="value" select="."/>
                                     </xsl:call-template>
                                 </xsl:if>
@@ -1032,14 +1035,13 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                             <xsl:for-each select="$Values/generic:Value">
                                 <xsl:variable name="concept" select="@concept"/>
                                 <xsl:call-template name="ObsProperty">
-                                    <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                    <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'dimension' or @propertyType = 'property')]"/>
                                     <xsl:with-param name="value" select="@value"/>
                                 </xsl:call-template>
                             </xsl:for-each>
 
                             <xsl:if test="$ObsTime != '' and $TimeDimensionConceptRef != ''">
-                                <xsl:element name="property:{$TimeDimensionConceptRef}" namespace="{$property}{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]}">
-
+                                <xsl:element name="{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]/@propertyType}:{$TimeDimensionConceptRef}" namespace="{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]/@propertyNamespace}{$SeriesKeyConceptsData/*[name() = $TimeDimensionConceptRef]}">
                                     <xsl:variable name="resourceRefPeriod" select="fn:getResourceRefPeriod($ObsTime)"/>
 
                                     <xsl:choose>
@@ -1062,7 +1064,8 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                             </xsl:if>
 
                             <xsl:for-each select="@*[local-name() = $PrimaryMeasureConceptRef]">
-                                <xsl:element name="property:{$PrimaryMeasureConceptRef}" namespace="{$property}{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]}">
+                                <xsl:element name="{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]/@propertyType}:{$PrimaryMeasureConceptRef}" namespace="{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]/@propertyNamespace}{$SeriesKeyConceptsData/*[name() = $PrimaryMeasureConceptRef]}">
+
                                     <xsl:variable name="datatype" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($PrimaryMeasureConceptRef)]/@datatype"/>
                                     <xsl:choose>
                                         <xsl:when test="$datatype != ''">
@@ -1088,7 +1091,7 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                                 <xsl:if test="$SeriesKeyConceptsData/*[@component = 'Attribute' and local-name() = $concept]">
                                     <xsl:if test="not(contains($omitComponents, lower-case($concept)))">
                                         <xsl:call-template name="ObsProperty">
-                                            <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept)]"/>
+                                            <xsl:with-param name="SeriesKeyConcept" select="$SeriesKeyConceptsData/*[lower-case(name()) = lower-case($concept) and (@propertyType = 'dimension' or @propertyType = 'property')]"/>
                                             <xsl:with-param name="value" select="."/>
                                         </xsl:call-template>
                                     </xsl:if>
@@ -1108,7 +1111,7 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
         <xsl:param name="SeriesKeyConcept"/>
         <xsl:param name="value"/>
 
-        <xsl:element name="property:{$SeriesKeyConcept/name()}" namespace="{$property}">
+        <xsl:element name="{$SeriesKeyConcept/@propertyType}:{$SeriesKeyConcept/name()}" namespace="{$SeriesKeyConcept/@propertyNamespace}">
             <xsl:choose>
                 <xsl:when test="$SeriesKeyConcept/@codelist != ''">
                     <xsl:attribute name="rdf:resource">
@@ -1121,7 +1124,7 @@ This is a one time retrieval but perhaps not necessary for the observations. Rev
                             </xsl:when>
 
                             <xsl:otherwise>
-                                <xsl:value-of select="fn:getComponentURI('code', $SeriesKeyConcept/@codelistAgency)"/><xsl:text>/</xsl:text><xsl:value-of select="$SeriesKeyConcept/@codelistVersion"/><xsl:text>/</xsl:text><xsl:value-of select="$SeriesKeyConcept/@codelist"/><xsl:value-of select="$uriThingSeparator"/><xsl:value-of select="normalize-space($value)"/>
+                                <xsl:value-of select="fn:getComponentBase('code', $SeriesKeyConcept/@codelistAgency)"/><xsl:text>/</xsl:text><xsl:value-of select="$SeriesKeyConcept/@codelistVersion"/><xsl:text>/</xsl:text><xsl:value-of select="$SeriesKeyConcept/@codelist"/><xsl:value-of select="$uriThingSeparator"/><xsl:value-of select="normalize-space($value)"/>
                             </xsl:otherwise>
                         </xsl:choose>
                     </xsl:attribute>