diff --git a/templates/xml/customer.xml b/templates/xml/customer.xml
index ce2c64bafbfdda88930518d6d356f8e5b2255414..5221b71662643f4e4cbdf05e551af9d94bc05b69 100644
--- a/templates/xml/customer.xml
+++ b/templates/xml/customer.xml
@@ -1,20 +1,34 @@
 <dcc:customer>
   {% set x = doc.administrativeData['customer'] %}
-  <dcc:name>   
+  {%- if x['name'] is defined %}
+  <dcc:name>
     {%- for i in x['name'] %}
     <dcc:content lang="{{i.lang}}">
       <![CDATA[{%- for j in i.content %}{{j|safe}}{% endfor -%}]]>
     </dcc:content>
     {% endfor -%}
   </dcc:name>
+  {% endif -%}
+  {%- if x['eMail'] is defined %}
   <dcc:eMail>{{x.eMail}}</dcc:eMail>
+  {% endif -%}
+  {%- if x['location'] is defined %}
   <dcc:location>
+    {%- if x.location.street is defined %}
     <dcc:street>{{x.location.street}}</dcc:street>
-    {%- if x.location.streetNo %}
+    {% endif -%}
+    {%- if x.location.streetNo is defined %}
     <dcc:streetNo>{{x.location.streetNo}}</dcc:streetNo>
     {% endif -%}
+    {%- if x.location.postCode is defined %}
     <dcc:postCode>{{x.location.postCode}}</dcc:postCode>
+    {% endif -%}
+    {%- if x.location.city is defined %}
     <dcc:city>{{x.location.city}}</dcc:city>
+    {% endif -%}
+    {%- if x.location.countryCode is defined %}
     <dcc:countryCode>{{x.location.countryCode}}</dcc:countryCode>
+    {% endif -%}
   </dcc:location>
+  {% endif -%}
 </dcc:customer>
diff --git a/templates/xml/dcc.xml b/templates/xml/dcc.xml
index 7e257987154e2aeebc20eac3b1f3c13e3eb51802..90d409cc76ff47361b0b8fbfc0ff8e5688bef64b 100644
--- a/templates/xml/dcc.xml
+++ b/templates/xml/dcc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dcc:digitalCalibrationCertificate
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://ptb.de/dcc https://ptb.de/dcc/v3.0.0/dcc.xsd"
+    xsi:schemaLocation="https://ptb.de/dcc https://www.ptb.de/dcc/v3.1.1/dcc.xsd"
     xmlns:dcc="https://ptb.de/dcc"
     xmlns:si="https://ptb.de/si"
     schemaVersion="3.1.1">   
diff --git a/zz.json b/zz.json
index a21ff12bb5facc059a865523deb87693eb608957..e57f07ef425d8e1a9298f85c1d63275ab50db268 100644
--- a/zz.json
+++ b/zz.json
@@ -170,6 +170,56 @@
           }
         ]
       },
+      "statements": {
+        "statement": [
+          {
+            "declaration": [
+              {
+                "content": "Die Ergebnisse beziehen sich nur auf den in diesem DCC beschriebenen Gegenstand.", 
+                "lang": "de"
+              }, 
+              {
+                "content": "The results refer only to the object calibrated in this DCC.", 
+                "lang": "en"
+              }
+            ], 
+            "norm": "DIN EN ISO/IEC 17025:2018-03", 
+            "reference": "7.8.2.1 l)"
+          }, 
+          {
+            "declaration": [
+              {
+                "content": "Die Ergebnisse gelten zum Zeitpunkt der Kalibrierung. Es obliegt dem Antragsteller, zu gegebener Zeit eine Rekalibrierung zu veranlassen.", 
+                "lang": "de"
+              }, 
+              {
+                "content": "The results refer only to the object calibrated in this DCC. The measurement results are valid at the time of calibration. The applicant is responsible for arranging a recalibration in due time.", 
+                "lang": "en"
+              }
+            ], 
+            "norm": "DIN EN ISO/IEC 17025:2018-03", 
+            "reference": "7.8.4.3"
+          }, 
+          {
+            "convention": "CIPM-MRA", 
+            "valid": true
+          }, 
+          {
+            "convention": "Tracebility", 
+            "declaration": [
+              {
+                "content": "Die Messung ist r\u00fcckf\u00fchrbar.", 
+                "lang": "de"
+              }, 
+              {
+                "content": "The measurement is traceable.", 
+                "lang": "en"
+              }
+            ], 
+            "traceable": true
+          }
+        ]
+      },
       "customer": {
         "name": [
           {