diff --git a/Step.Config/Config/maintenancesConfig.xml b/Step.Config/Config/maintenancesConfig.xml
index 48835afa..bbef8b53 100644
--- a/Step.Config/Config/maintenancesConfig.xml
+++ b/Step.Config/Config/maintenancesConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <maintenances>
+  <maintenance>
     <id>1</id>
     <localizedNames>
       <lang langKey="en">Test</lang>
@@ -8,7 +8,7 @@
     </localizedNames>
     <interval>10</interval>
     <deadline>15/02/2018 13:00</deadline>
-    <type>time_interval</type>
+    <type>exp_date</type>
     <counterId>2</counterId>
-  </maintenances>
+  </maintenance>
 </root>
\ No newline at end of file
diff --git a/Step.Config/Config/maintenancesConfigValidator.xsd b/Step.Config/Config/maintenancesConfigValidator.xsd
index d9a6e343..50ce3478 100644
--- a/Step.Config/Config/maintenancesConfigValidator.xsd
+++ b/Step.Config/Config/maintenancesConfigValidator.xsd
@@ -3,7 +3,8 @@
   <xs:element name="root">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="maintenances" minOccurs="0" maxOccurs="unbounded">
+        <!-- Maintenance -->
+        <xs:element name="maintenance" minOccurs="0" maxOccurs="unbounded">
           <xs:complexType>
             <xs:all>
               <xs:element name="id" type="xs:int" />
@@ -24,18 +25,20 @@
         </xs:element>
       </xs:sequence>
     </xs:complexType>
-
+    <!-- Unique id constraint -->
     <xs:unique name="UniqueId">
-      <xs:selector xpath="maintenances"/>
-      <xs:field xpath="@id" />
+      <xs:selector xpath="maintenance"/>
+      <xs:field xpath="id" />
     </xs:unique>
-    
+
+    <!-- Unique language id constraint -->
     <xs:unique name="UniqueLangKey">
       <xs:selector xpath="lang" />
       <xs:field xpath="@langKey" />
     </xs:unique>
   </xs:element>
-
+  
+<!-- Language Type -->
   <xs:complexType name="langType">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -43,7 +46,7 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
+<!-- Maintenance Type -->
   <xs:simpleType name="maintenanceType" final="restriction">
     <xs:restriction base="xs:string">
       <xs:enumeration value="machine_interval" />
@@ -51,4 +54,5 @@
       <xs:enumeration value="exp_date" />
     </xs:restriction>
   </xs:simpleType>
+
 </xs:schema>
\ No newline at end of file