diff --git a/mappings/EDSCP/Enershare-Eumed/constructEnershareToEumed.rqg b/mappings/EDSCP/Enershare-Eumed/constructEnershareToEumed.rqg
index 6202af32728386f848254b19bd4461835af262da..20f20351fdaffec61a8813e8772aea8d35802c16 100644
--- a/mappings/EDSCP/Enershare-Eumed/constructEnershareToEumed.rqg
+++ b/mappings/EDSCP/Enershare-Eumed/constructEnershareToEumed.rqg
@@ -18,6 +18,7 @@ PREFIX sch:<https:schema.org/>
 PREFIX ex: <http://www.example.com> 
 PREFIX dcterms: <http://purl.org/dc/terms/>
 
+# On the Repository Enershare Energy 500
 CONSTRUCT { 
     
     ?MeterReadingSet rdf:type owl:NamedIndividual, eme:MeterReadingSet .
@@ -27,14 +28,14 @@ CONSTRUCT {
                 eme:isMeterReadingAsPartOfMeterReadingSet ?MeterReadingSet.
 
     ?DateTimeInterval_1 rdf:type owl:NamedIndividual, time:DateTimeInterval;
-    time:hasBeginning ?minDateTime; 
-    time:hasEnd ?maxDateTime.
+    time:hasBeginning ?minDateTimeXSD ; 
+    time:hasEnd ?maxDateTimeXSD.
 
     
     ?intervalReadingURI rdf:type owl:NamedIndividual, eme:IntervalReading ;
                         eme:isPartOfIntervalBlock ?intervalBlockURI ;
-    					eme:value ?newvalue ;
-                        eme:timeStamp ?dateTime.
+    					eme:value ?newValueXSD ;
+                        eme:timeStamp ?dateTimeXSD.
  
     
    ?intervalBlockURI  a   owl:NamedIndividual, eme:IntervalBlock;
@@ -46,7 +47,7 @@ CONSTRUCT {
     eme:hasNameAsUsagePoint ?usagePointName_1.
             
 	?usagePointName_1 rdf:type owl:NamedIndividual, eme:Name ;
-    eme:name ?HouseHoldLabel ;
+    eme:name ?HouseHoldLabelXSD ;
     eme:hasNameType sample:NameType_1. #-- EUMED UsagePoint
         
     sample:NameType_1 rdf:type owl:NamedIndividual, eme:NameType ;
@@ -62,7 +63,7 @@ CONSTRUCT {
     eme:multiplier ?newUnitMultiplier.
 	
    ?ReadingTypeName_2 rdf:type owl:NamedIndividual, eme:Name ;
-    eme:name ?ElectricEnergyConsumptionPropertyLabel ;
+    eme:name ?ElectricEnergyConsumptionPropertyLabelXSD ;
     eme:hasNameType sample:NameType_2. 
 
     sample:NameType_2 rdf:type owl:NamedIndividual, eme:NameType ;
@@ -109,7 +110,7 @@ CONSTRUCT {
       ?timeSeriesURI rdf:type  ic-data:TimeSeries, owl:NamedIndividual ;
                             ic-data:hasDataPoint ?ElectricEnergyConsumptionEvaluation;
                             ic-data:hasTemporalResolution ?duration ;
-                            ic-data:hasUpdateRate ?durationn ;
+                            ic-data:hasUpdateRate ?duration ;
                             ic-data:hasUsage ?usage;
                             qudt:hasQuantityKind ?quantityKind; 
                             qudt:hasUnit ?unit.
@@ -141,6 +142,7 @@ CONSTRUCT {
   
   BIND(IF( ?quantityKind = <http://qudt.org/vocab/quantitykind/Energy> , eme:energy , ?empty) AS ?measureKind)
   BIND(IF( ?unit = qudt-unit:KiloW-HR, eme:Wh, ?empty)  AS ?newUnit)
+                   
   BIND(IF( ?unit = qudt-unit:KiloW-HR, eme:k, ?empty)  AS ?newUnitMultiplier)  
     
   BIND(IF( ?usage = ic-data:consumption, eme:forward, ?empty)  AS ?flowDirection)
@@ -149,4 +151,11 @@ CONSTRUCT {
     
   BIND(IF( ?duration ="PT15M"^^xsd:duration ,eme:fifteenMinute , ?empty)  AS ?durationyTarget)
     BIND(STRBEFORE(str(?value), " ")  AS ?newvalue)  
+    
+    BIND (xsd:dateTime(?minDateTime) as ?minDateTimeXSD) 
+    BIND (xsd:dateTime(?maxDateTime) as ?maxDateTimeXSD) 
+    BIND (xsd:dateTime(?dateTime) as ?dateTimeXSD) 
+    BIND (xsd:float(?newvalue) as ?newValueXSD) 
+    BIND (xsd:string(?HouseHoldLabel) as ?HouseHoldLabelXSD) 
+    BIND (xsd:string(?ElectricEnergyConsumptionPropertyLabel) as ?ElectricEnergyConsumptionPropertyLabelXSD) 
 } 
\ No newline at end of file