diff --git a/pom.xml b/pom.xml
index 1644f3e1..0861c810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>fr.ign.validator</groupId>
 	<artifactId>validator</artifactId>
 	<packaging>pom</packaging>
-	<version>4.4.6-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>Validator</name>
 
 	<scm>
@@ -37,10 +37,6 @@
 		<apache-common-cli.version>1.8.0</apache-common-cli.version>
 		<apache-commons-csv.version>1.11.0</apache-commons-csv.version>
 		<apache-commons-lang.version>2.6</apache-commons-lang.version>
-		<!-- jaxb -->
-		<jaxb-core.version>2.3.0.1</jaxb-core.version>
-		<jaxb-impl.version>2.3.9</jaxb-impl.version>
-		<jaxb-api.version>2.3.1</jaxb-api.version>
 		<!-- JDBC -->
 		<postgresql.version>9.1-901-1.jdbc4</postgresql.version>
 		<sqlite-jdbc.version>3.46.0.1</sqlite-jdbc.version>
@@ -53,9 +49,6 @@
 		<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
 		<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
 		<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
-		<!-- JDK 8 features -->
-		<javax.annotation.version>1.3.2</javax.annotation.version>
-		<javax.activation.version>1.1.1</javax.activation.version>
 
 		<!-- sonarqube -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -225,22 +218,6 @@
 			<version>${jaxen.version}</version>
 		</dependency>
 
-		<!-- JABX is required by XmlModelReader -->
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>${jaxb-api.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-core</artifactId>
-			<version>${jaxb-core.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>${jaxb-impl.version}</version>
-		</dependency>
 
 		<!--
 		################################################################
@@ -261,22 +238,6 @@
 			<version>${postgresql.version}</version>
 		</dependency>
 
-		<!--
-		################################################################
-			JDK 8 libraries
-		################################################################
-		-->
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax.annotation.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>${javax.activation.version}</version>
-		</dependency>
-
 		<!--
 		################################################################
 			Test dependencies
diff --git a/validator-cli/pom.xml b/validator-cli/pom.xml
index 794dd91d..b31ec3d0 100644
--- a/validator-cli/pom.xml
+++ b/validator-cli/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>fr.ign.validator</groupId>
 		<artifactId>validator</artifactId>
-		<version>4.4.6-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<name>validator-cli</name>
 	<artifactId>validator-cli</artifactId>
diff --git a/validator-core/pom.xml b/validator-core/pom.xml
index bb059383..f875c23f 100644
--- a/validator-core/pom.xml
+++ b/validator-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>fr.ign.validator</groupId>
 		<artifactId>validator</artifactId>
-		<version>4.4.6-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>validator-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java b/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java
index bbcc7200..4b21b3e0 100644
--- a/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java
+++ b/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java
@@ -20,8 +20,6 @@
 import org.apache.logging.log4j.MarkerManager;
 import org.locationtech.jts.geom.Geometry;
 
-import com.ctc.wstx.util.StringUtil;
-
 import fr.ign.validator.Context;
 import fr.ign.validator.Version;
 import fr.ign.validator.command.options.DocumentEmpriseOption;
diff --git a/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java
index 7bfdc1d0..42284334 100644
--- a/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java
+++ b/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java
@@ -21,7 +21,7 @@
 import fr.ign.validator.tools.ModelHelper;
 
 /**
- * Common implementation for JSON and XML ModelReader.
+ * Common implementation for JSON and XML ModelReader (removed).
  *
  * @author MBorne
  */
diff --git a/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java
index 00a79ad8..1c27ebfe 100644
--- a/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java
+++ b/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java
@@ -21,7 +21,7 @@ public interface ModelReader {
     public String getFormat();
 
     /**
-     * Read File as a DocumentModel (files.xml)
+     * Read File as a DocumentModel
      *
      * @param documentModelPath
      * @return
diff --git a/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java b/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java
index bfe3f233..41295cd1 100644
--- a/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java
+++ b/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java
@@ -2,6 +2,8 @@
 
 import java.net.URL;
 
+import fr.ign.validator.exception.InvalidModelException;
+
 /**
  * Create ModelReader instances
  *
@@ -26,7 +28,9 @@ private ModelReaderFactory() {
      */
     public static ModelReader createModelReader(URL url) {
         if (url.toString().endsWith(".xml")) {
-            return new XmlModelReader();
+            throw new InvalidModelException(
+                "Fail to load " + url + " (XML model support has been removed, use JSON format)"
+            );
         } else {
             return new JsonModelReader();
         }
diff --git a/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java
deleted file mode 100644
index d38c4476..00000000
--- a/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package fr.ign.validator.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import fr.ign.validator.exception.InvalidModelException;
-import fr.ign.validator.exception.ModelNotFoundException;
-import fr.ign.validator.model.DocumentModel;
-import fr.ign.validator.model.FeatureType;
-
-/**
- * Load models using deprecated XML format
- *
- * @author MBorne
- */
-public class XmlModelReader extends AbstractModelReader {
-
-    private JAXBContext context;
-    private Unmarshaller unmarshaller;
-
-    public XmlModelReader() {
-        log.trace(MARKER, "Initializing XmlModelReader...");
-        try {
-            this.context = JAXBContext.newInstance(FeatureType.class, DocumentModel.class);
-            this.unmarshaller = context.createUnmarshaller();
-        } catch (JAXBException e) {
-            throw new RuntimeException("fail to load JAXB context", e);
-        }
-    }
-
-    @Override
-    public String getFormat() {
-        return "xml";
-    }
-
-    @Override
-    public DocumentModel loadDocumentModel(URL documentModelUrl) throws ModelNotFoundException, InvalidModelException {
-        log.info(MARKER, "Loading DocumentModel from {} ...", documentModelUrl);
-
-        /*
-         * loading documentModel
-         */
-        InputStream is = getInputStream(documentModelUrl);
-        try {
-            DocumentModel documentModel = (DocumentModel) unmarshaller.unmarshal(is);
-            loadFeatureTypes(documentModel, documentModelUrl);
-            return documentModel;
-        } catch (JAXBException | IOException e) {
-            String message = String.format("Fail to load FeatureType from %1s", documentModelUrl);
-            throw new InvalidModelException(message, e);
-        }
-    }
-
-    @Override
-    public FeatureType loadFeatureType(URL featureTypeUrl) throws ModelNotFoundException, InvalidModelException {
-        log.info(MARKER, "loadFeatureType({}) ...", featureTypeUrl);
-        InputStream is = getInputStream(featureTypeUrl);
-        try {
-            return (FeatureType) unmarshaller.unmarshal(is);
-        } catch (JAXBException e) {
-            String message = String.format("Fail to load FeatureType from %1s", featureTypeUrl);
-            throw new InvalidModelException(message, e);
-        }
-    }
-
-}
diff --git a/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java b/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java
deleted file mode 100644
index 67c246e6..00000000
--- a/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package fr.ign.validator.io.xml;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import fr.ign.validator.model.AttributeConstraints;
-import fr.ign.validator.model.AttributeType;
-
-@XmlType(propOrder = {
-    "name", "type", "definition", "regexp", "size", "nullable", "listOfValues", "identifiant", "reference"
-})
-public class AttributeTypeAdapter extends XmlAdapter<AttributeTypeAdapter.AdaptedAttributeType, AttributeType<?>> {
-
-    /**
-     * Legacy XML format
-     *
-     * @author MBorne
-     */
-    public static class AdaptedAttributeType {
-        public String name;
-        public String type;
-        public String definition;
-        public String regexp;
-        public Integer size;
-        public boolean nullable;
-        public boolean identifier;
-        public String reference;
-        @XmlElementWrapper(name = "listOfValues")
-        @XmlElement(name = "value")
-        public List<String> listOfValues;
-    }
-
-    @Override
-    public AdaptedAttributeType marshal(AttributeType<?> attributeType) throws Exception {
-        if (null == attributeType) {
-            return null;
-        }
-
-        AdaptedAttributeType adaptedAttributeType = new AdaptedAttributeType();
-        adaptedAttributeType.name = attributeType.getName();
-        adaptedAttributeType.type = attributeType.getTypeName();
-        adaptedAttributeType.definition = attributeType.getDescription();
-
-        AttributeConstraints constraints = attributeType.getConstraints();
-        adaptedAttributeType.nullable = !constraints.isRequired();
-        adaptedAttributeType.identifier = constraints.isUnique();
-        adaptedAttributeType.regexp = constraints.getPattern();
-        adaptedAttributeType.size = constraints.getMaxLength();
-        adaptedAttributeType.listOfValues = constraints.getEnumValues();
-        adaptedAttributeType.reference = constraints.getReference();
-        return adaptedAttributeType;
-    }
-
-    @Override
-    public AttributeType<?> unmarshal(AttributeTypeAdapter.AdaptedAttributeType adaptedValueType) throws Exception {
-        if (null == adaptedValueType) {
-            return null;
-        }
-
-        AttributeType<?> attributeType = AttributeType.forName(adaptedValueType.type);
-        attributeType.setName(adaptedValueType.name);
-        attributeType.setDescription(adaptedValueType.definition);
-
-        AttributeConstraints constraints = attributeType.getConstraints();
-        constraints.setRequired(!adaptedValueType.nullable);
-        constraints.setUnique(adaptedValueType.identifier);
-        constraints.setPattern(adaptedValueType.regexp);
-        constraints.setMaxLength(adaptedValueType.size);
-        constraints.getEnumValues(adaptedValueType.listOfValues);
-        constraints.setReference(adaptedValueType.reference);
-
-        return attributeType;
-    }
-
-}
diff --git a/validator-core/src/main/java/fr/ign/validator/io/xml/FileModelAdapter.java b/validator-core/src/main/java/fr/ign/validator/io/xml/FileModelAdapter.java
deleted file mode 100644
index 2ddb8edb..00000000
--- a/validator-core/src/main/java/fr/ign/validator/io/xml/FileModelAdapter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package fr.ign.validator.io.xml;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import fr.ign.validator.model.FileModel;
-import fr.ign.validator.model.FileModelFactory;
-import fr.ign.validator.model.FileModel.MandatoryMode;
-
-/**
- * FileModel serialization adapter
- *
- * Note that "regexp" is renamed to "path"
- *
- * @author MBorne
- *
- */
-public class FileModelAdapter extends XmlAdapter<FileModelAdapter.AdaptedFileModel, FileModel> {
-
-    public static class AdaptedFileModel {
-        public String name;
-        public String type;
-        public String path;
-        public MandatoryMode mandatory = MandatoryMode.WARN;
-    }
-
-    @Override
-    public FileModel unmarshal(AdaptedFileModel adaptedFileModel) throws Exception {
-        if (null == adaptedFileModel) {
-            return null;
-        }
-        FileModel fileModel = FileModelFactory.createFileModelByType(adaptedFileModel.type);
-        if (null == fileModel) {
-            throw new Exception(
-                String.format(
-                    "attribut type invalide dans balise <file> : {}", adaptedFileModel.type
-                )
-            );
-        }
-        fileModel.setName(adaptedFileModel.name);
-        fileModel.setPath(adaptedFileModel.path);
-        fileModel.setMandatory(adaptedFileModel.mandatory);
-        return fileModel;
-    }
-
-    @Override
-    public AdaptedFileModel marshal(FileModel fileModel) throws Exception {
-        if (null == fileModel) {
-            return null;
-        }
-        AdaptedFileModel adaptedFileModel = new AdaptedFileModel();
-        adaptedFileModel.type = fileModel.getType();
-        adaptedFileModel.name = fileModel.getName();
-        adaptedFileModel.path = fileModel.getPath();
-        adaptedFileModel.mandatory = fileModel.getMandatory();
-        return adaptedFileModel;
-    }
-
-}
diff --git a/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java b/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java
index 0805a8d5..30d037ee 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java
@@ -3,16 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 import fr.ign.validator.data.Attribute;
-import fr.ign.validator.io.xml.AttributeTypeAdapter;
 import fr.ign.validator.validation.Validator;
 import fr.ign.validator.validation.attribute.AttributeRequiredValidator;
 import fr.ign.validator.validation.attribute.CharactersValidator;
@@ -24,7 +20,6 @@
  *
  * @param <T> the matching java type
  */
-@XmlJavaTypeAdapter(AttributeTypeAdapter.class)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonInclude(value = Include.NON_NULL)
 public abstract class AttributeType<T> implements Model, Cloneable {
@@ -118,7 +113,6 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    @XmlTransient
     public AttributeConstraints getConstraints() {
         return constraints;
     }
@@ -127,89 +121,6 @@ public void setConstraints(AttributeConstraints constraints) {
         this.constraints = constraints;
     }
 
-    @Deprecated
-    public boolean hasRegexp() {
-        return null != constraints.getPattern();
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public String getRegexp() {
-        return constraints.getPattern();
-    }
-
-    @Deprecated
-    public void setRegexp(String regexp) {
-        this.constraints.setPattern(regexp);
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public Integer getSize() {
-        return constraints.getMaxLength();
-    }
-
-    @Deprecated
-    public void setSize(Integer size) {
-        this.constraints.setMaxLength(size);
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public boolean isNullable() {
-        return !constraints.isRequired();
-    }
-
-    @Deprecated
-    public void setNullable(boolean nullable) {
-        this.constraints.setRequired(!nullable);
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public boolean hasListOfValues() {
-        return constraints.getEnumValues() != null;
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public List<String> getListOfValues() {
-        return constraints.getEnumValues();
-    }
-
-    @Deprecated
-    public void setListOfValues(List<String> listOfValues) {
-        this.constraints.getEnumValues(listOfValues);
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public boolean isIdentifier() {
-        return constraints.isUnique();
-    }
-
-    @Deprecated
-    public void setIdentifier(boolean identifier) {
-        this.constraints.setUnique(identifier);
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public String getReference() {
-        return this.constraints.getReference();
-    }
-
-    @Deprecated
-    public void setReference(String reference) {
-        this.constraints.setReference(reference);
-    }
-
-    @Deprecated
-    @JsonIgnore
-    public boolean isReference() {
-        return this.constraints.getReference() != null;
-    }
-
     @Deprecated
     @JsonIgnore
     public String getTableReference() {
diff --git a/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java b/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java
index fc0def50..bb263131 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java
@@ -11,6 +11,7 @@
  * Double, etc.)
  *
  * @see src/main/resources/META-INF/services/fr.ign.validator.model.AttributeType
+ *      containing the list of this types.
  *
  * @author MBorne
  *
diff --git a/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java b/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java
index 31af6852..773e1621 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java
@@ -4,12 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
@@ -33,10 +27,6 @@
  *
  * @author MBorne
  */
-@XmlRootElement(name = "document")
-@XmlType(propOrder = {
-    "name", "regexp", "fileModels", "staticTables"
-})
 public class DocumentModel implements Model {
     public static final Logger log = LogManager.getRootLogger();
     public static final Marker MARKER = MarkerManager.getMarker("DocumentModel");
@@ -103,7 +93,6 @@ public void setName(String name) {
         this.name = name;
     }
 
-    @XmlTransient
     public DocumentConstraints getConstraints() {
         return constraints;
     }
@@ -132,8 +121,6 @@ public void setRegexp(String regexp) {
         this.constraints.setFolderName(regexp);
     }
 
-    @XmlElementWrapper(name = "files")
-    @XmlElement(name = "file")
     @JsonProperty("files")
     public List<FileModel> getFileModels() {
         return fileModels;
diff --git a/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java b/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java
index 5ea34eda..69782074 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java
@@ -3,12 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import fr.ign.validator.model.type.GeometryType;
@@ -18,10 +12,6 @@
  *
  * @author MBorne
  */
-@XmlRootElement
-@XmlType(propOrder = {
-    "name", "description", "attributes", "constraints"
-})
 public class FeatureType implements Model {
     /**
      * Parent (optional)
@@ -72,13 +62,11 @@ public FeatureType getParent() {
      *
      * @param featureType
      */
-    @XmlTransient
     public void setParent(FeatureType parent) {
         this.parent = parent;
     }
 
     @Override
-    @XmlElement(name = "typeName")
     public String getName() {
         return name;
     }
@@ -120,7 +108,6 @@ public String getDescription() {
         return description;
     }
 
-    @XmlElement
     public void setDescription(String description) {
         this.description = description;
     }
@@ -136,8 +123,6 @@ public List<AttributeType<?>> getAttributes() {
         return attributes;
     }
 
-    @XmlElementWrapper(name = "attributes")
-    @XmlElement(name = "attribute")
     @JsonProperty("columns")
     public void setAttributes(List<AttributeType<?>> attributes) {
         this.attributes = attributes;
diff --git a/validator-core/src/main/java/fr/ign/validator/model/FileModel.java b/validator-core/src/main/java/fr/ign/validator/model/FileModel.java
index fddcba4e..f323ad36 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/FileModel.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/FileModel.java
@@ -7,10 +7,6 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
@@ -24,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import fr.ign.validator.data.DocumentFile;
-import fr.ign.validator.io.xml.FileModelAdapter;
 import fr.ign.validator.model.file.DirectoryModel;
 import fr.ign.validator.model.file.MetadataModel;
 import fr.ign.validator.model.file.MultiTableModel;
@@ -38,7 +33,6 @@
  *
  * @author MBorne
  */
-@XmlJavaTypeAdapter(FileModelAdapter.class)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes({
     @Type(value = DirectoryModel.class, name = DirectoryModel.TYPE),
@@ -51,7 +45,6 @@ public abstract class FileModel implements Model {
     public static final Logger log = LogManager.getRootLogger();
     public static final Marker MARKER = MarkerManager.getMarker("FileModel");
 
-    @XmlEnum(String.class)
     public enum MandatoryMode {
         /**
          * Ignore if file is missing
@@ -129,7 +122,6 @@ public String getPath() {
         return path;
     }
 
-    @XmlElement(name = "regexp")
     public void setPath(String path) {
         this.path = path;
     }
diff --git a/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java b/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java
index 6ee70634..5b074c1e 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java
@@ -2,8 +2,6 @@
 
 import java.net.URL;
 
-import javax.xml.bind.annotation.XmlTransient;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -68,7 +66,6 @@ public URL getData() {
         return data;
     }
 
-    @XmlTransient
     public void setData(URL data) {
         this.data = data;
     }
diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java
index d611d160..d18f2d3c 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java
@@ -1,7 +1,5 @@
 package fr.ign.validator.model.file;
 
-import javax.xml.bind.annotation.XmlTransient;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -48,7 +46,6 @@ public String getName() {
         return name;
     }
 
-    @XmlTransient
     public void setName(String name) {
         this.name = name;
     }
@@ -57,7 +54,6 @@ public String getPath() {
         return path;
     }
 
-    @XmlTransient
     public void setPath(String path) {
         this.path = path;
     }
diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java
index ccfd4629..f50c71ad 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java
@@ -4,9 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import fr.ign.validator.data.DocumentFile;
@@ -51,8 +48,6 @@ public void setTableModels(List<EmbeddedTableModel> tableModels) {
         this.tableModels = tableModels;
     }
 
-    @XmlElementWrapper(name = "tables")
-    @XmlElement(name = "table")
     @JsonProperty("tables")
     public List<EmbeddedTableModel> getTableModels() {
         return tableModels;
diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java
index 16966f62..d511eaf2 100644
--- a/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java
+++ b/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java
@@ -2,8 +2,6 @@
 
 import java.io.File;
 
-import javax.xml.bind.annotation.XmlTransient;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -61,7 +59,6 @@ public FeatureType getFeatureType() {
         return featureType;
     }
 
-    @XmlTransient
     public void setFeatureType(FeatureType featureType) {
         this.featureType = featureType;
     }
diff --git a/validator-core/src/main/java/fr/ign/validator/model/package-info.java b/validator-core/src/main/java/fr/ign/validator/model/package-info.java
deleted file mode 100644
index f173c7ae..00000000
--- a/validator-core/src/main/java/fr/ign/validator/model/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@XmlSchema(xmlns = {
-    @XmlNs(prefix = "xsd", namespaceURI = "http://www.w3.org/2001/XMLSchema")
-}, elementFormDefault = XmlNsForm.UNQUALIFIED, attributeFormDefault = XmlNsForm.QUALIFIED)
-package fr.ign.validator.model;
-
-import javax.xml.bind.annotation.*;
diff --git a/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java b/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java
index 88cb6a2d..50f59d61 100644
--- a/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java
@@ -1,5 +1,7 @@
 package fr.ign.validator.io;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.MalformedURLException;
@@ -7,13 +9,25 @@
 
 import org.junit.Test;
 
+import fr.ign.validator.exception.InvalidModelException;
+
 public class ModelReaderFactoryTest {
 
     @Test
     public void testXml() throws MalformedURLException {
         URL url = new URL("https://example.org/my-model.xml");
-        ModelReader reader = ModelReaderFactory.createModelReader(url);
-        assertTrue(reader instanceof XmlModelReader);
+        RuntimeException thrown = null;
+        try {
+            ModelReaderFactory.createModelReader(url);
+        } catch (RuntimeException e) {
+            thrown = e;
+        }
+        assertNotNull(thrown);
+        assertTrue(thrown instanceof InvalidModelException);
+        assertEquals(
+            "Fail to load https://example.org/my-model.xml (XML model support has been removed, use JSON format)",
+            thrown.getMessage()
+        );
     }
 
     @Test
diff --git a/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java b/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java
deleted file mode 100644
index e50928a8..00000000
--- a/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package fr.ign.validator.io;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import fr.ign.validator.exception.ModelNotFoundException;
-import fr.ign.validator.model.AttributeConstraints;
-import fr.ign.validator.model.AttributeType;
-import fr.ign.validator.model.DocumentModel;
-import fr.ign.validator.model.FeatureType;
-import fr.ign.validator.model.FileModel;
-import fr.ign.validator.model.FileModel.MandatoryMode;
-import fr.ign.validator.model.TableModel;
-import fr.ign.validator.model.file.SingleTableModel;
-import fr.ign.validator.tools.ResourceHelper;
-
-public class XmlModelReaderTest {
-
-    private ModelReader modelLoader;
-
-    @Before
-    public void setUp() throws Exception {
-        modelLoader = new XmlModelReader();
-    }
-
-    /**
-     * Ensure that ModelNotFoundException are thrown if DocumentModel file doesn't
-     * exists
-     */
-    @Test
-    public void testLoadDocumentModelFileNotFound() {
-        File configDir = ResourceHelper.getResourceFile(getClass(), "/config-xml");
-        File documentModelPath = new File(configDir, "/not-found/files.xml");
-        boolean thrown = false;
-        try {
-            modelLoader.loadDocumentModel(documentModelPath);
-        } catch (ModelNotFoundException e) {
-            Assert.assertTrue(e.getMessage().contains("/not-found/files.xml"));
-            thrown = true;
-        }
-        Assert.assertTrue("ModelNotFoundException excepted", thrown);
-    }
-
-    /**
-     * Ensure that ModelNotFoundException are thrown if DocumentModel URL doesn't
-     * exists
-     *
-     * @throws MalformedURLException
-     */
-    @Test
-    public void testLoadDocumentModelUrlNotFound() throws MalformedURLException {
-        URL documentModelUrl = new URL("https://example.local/not-found/files.xml");
-        boolean thrown = false;
-        try {
-            modelLoader.loadDocumentModel(documentModelUrl);
-        } catch (ModelNotFoundException e) {
-            Assert.assertEquals("Model 'https://example.local/not-found/files.xml' not found", e.getMessage());
-            thrown = true;
-        }
-        Assert.assertTrue("ModelNotFoundException excepted", thrown);
-    }
-
-    /**
-     * Ensure that ModelNotFoundException are thrown if a FeatureType is missing
-     *
-     * @throws MalformedURLException
-     */
-    @Test
-    public void testLoadDocumentModelFeatureTypeNotFound() throws MalformedURLException {
-        File documentModelPath = ResourceHelper.getResourceFile(
-            getClass(), "/config-xml/missing_feature_type/files.xml"
-        );
-        boolean thrown = false;
-        try {
-            modelLoader.loadDocumentModel(documentModelPath);
-        } catch (ModelNotFoundException e) {
-            Assert.assertTrue(e.getMessage().contains("/missing_feature_type/types/MY_TABLE.xml' not found"));
-            thrown = true;
-        }
-        Assert.assertTrue("ModelNotFoundException excepted", thrown);
-    }
-
-    /**
-     * Read cnig_PLU_2014 and performs regress test
-     *
-     * @throws JsonProcessingException
-     */
-    @Test
-    public void testLoadDocumentModelCnigPlu2014() {
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/cnig_PLU_2014/files.xml");
-        DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
-        assertIsValid(documentModel);
-
-        Assert.assertEquals("cnig_PLU_2014", documentModel.getName());
-        Assert.assertEquals(31, documentModel.getFileModels().size());
-    }
-
-    /**
-     * Read adresse model and performs regress test
-     *
-     * @throws JsonProcessingException
-     */
-    @Test
-    public void testLoadDocumentModelAdresse() {
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/adresse/files.xml");
-        DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
-        assertIsValid(documentModel);
-
-        Assert.assertEquals("adresse", documentModel.getName());
-        Assert.assertEquals(1, documentModel.getFileModels().size());
-
-        FileModel fileModel = documentModel.getFileModels().get(0);
-        Assert.assertEquals("ADRESSE", fileModel.getName());
-
-        Assert.assertTrue(fileModel instanceof SingleTableModel);
-        FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-        Assert.assertNotNull(featureType);
-        Assert.assertEquals(2, featureType.getAttributeCount());
-
-        int index = 0;
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("ID", attribute.getName());
-            Assert.assertEquals("String", attribute.getTypeName());
-            Assert.assertTrue(attribute.getConstraints().isUnique());
-        }
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("ADRESSE", attribute.getName());
-            Assert.assertEquals("String", attribute.getTypeName());
-            Assert.assertFalse(attribute.getConstraints().isUnique());
-        }
-    }
-
-    /**
-     * Load DocumentModel /config-xml/sample-document/files.xml and performs checks
-     */
-    @Test
-    public void testLoadDocumentModelSampleDocument() {
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/sample-document/files.xml");
-        DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
-        assertIsValid(documentModel);
-
-        // name
-        Assert.assertEquals("ccccc_CC_dddddddd", documentModel.getName());
-        // DocumentContraints
-        Assert.assertEquals(
-            "[0-9]{5}_CC_[0-9]{8}",
-            documentModel.getConstraints().getFolderName()
-        );
-        Assert.assertNull(
-            documentModel.getConstraints().getMetadataSpecification()
-        );
-
-        // fileModels
-        Assert.assertEquals(3, documentModel.getFileModels().size());
-        int index = 0;
-        {
-            FileModel fileModel = documentModel.getFileModels().get(index++);
-            Assert.assertEquals("SIMPLE", fileModel.getName());
-            Assert.assertTrue(fileModel instanceof SingleTableModel);
-            FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-            Assert.assertNotNull(featureType);
-            Assert.assertEquals(MandatoryMode.WARN, fileModel.getMandatory());
-            Assert.assertEquals("SIMPLE", featureType.getName());
-        }
-        {
-            FileModel fileModel = documentModel.getFileModels().get(index++);
-            Assert.assertEquals("Donnees_geographiques", fileModel.getName());
-            Assert.assertEquals(MandatoryMode.ERROR, fileModel.getMandatory());
-        }
-        {
-            FileModel fileModel = documentModel.getFileModels().get(index++);
-            Assert.assertEquals("COMMUNE", fileModel.getName());
-            Assert.assertEquals(MandatoryMode.WARN, fileModel.getMandatory());
-
-            Assert.assertTrue(fileModel instanceof SingleTableModel);
-            FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-            Assert.assertNotNull(featureType);
-            Assert.assertEquals("COMMUNE", featureType.getName());
-            assertExceptedFeatureTypeCommune(featureType);
-        }
-    }
-
-    /**
-     * Check FeatureType definition for
-     * /config-xml/sample-document/types/COMMUNE.xml
-     *
-     * @param featureType
-     */
-    private void assertExceptedFeatureTypeCommune(FeatureType featureType) {
-        int index = 0;
-        {
-            AttributeType<?> attributeType = featureType.getAttribute(index++);
-            Assert.assertEquals("INSEE", attributeType.getName());
-            Assert.assertEquals("String", attributeType.getTypeName());
-            AttributeConstraints contraints = attributeType.getConstraints();
-            Assert.assertEquals(true, contraints.isRequired());
-            Assert.assertEquals(true, contraints.isUnique());
-            Assert.assertEquals("[0-9]{5}", contraints.getPattern());
-            Assert.assertNull(contraints.getReference());
-            Assert.assertNull(contraints.getEnumValues());
-        }
-        {
-            AttributeType<?> attributeType = featureType.getAttribute(index++);
-            Assert.assertEquals("CODE_DEPT", attributeType.getName());
-            Assert.assertEquals("String", attributeType.getTypeName());
-            AttributeConstraints constraints = attributeType.getConstraints();
-            Assert.assertEquals(true, constraints.isRequired());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertEquals(false, constraints.isUnique());
-            Assert.assertNull(constraints.getReference());
-            Assert.assertNotNull(constraints.getEnumValues());
-            Assert.assertEquals("01,02", Strings.join(constraints.getEnumValues(), ','));
-        }
-        {
-            AttributeType<?> attributeType = featureType.getAttribute(index++);
-            Assert.assertEquals("DETRUIT", attributeType.getName());
-            Assert.assertEquals("Boolean", attributeType.getTypeName());
-            AttributeConstraints constraints = attributeType.getConstraints();
-            Assert.assertEquals(false, constraints.isRequired());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertEquals(false, constraints.isUnique());
-            Assert.assertNull(constraints.getReference());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-    }
-
-    @Test
-    public void testLoadFeatureTypeWithCDATA() {
-        File srcFile = ResourceHelper.getResourceFile(getClass(), "/config-xml/sample-document/types/SIMPLE.xml");
-
-        FeatureType featureType = modelLoader.loadFeatureType(srcFile);
-        Assert.assertEquals("SIMPLE", featureType.getName());
-        Assert.assertEquals("TABLE TEST", featureType.getDescription());
-        Assert.assertEquals(3, featureType.getAttributeCount());
-        Assert.assertTrue(featureType.isSpatial());
-
-        int index = 0;
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("ID", attribute.getName());
-            Assert.assertEquals("Integer", attribute.getTypeName());
-
-            AttributeConstraints constraints = attribute.getConstraints();
-            Assert.assertTrue(constraints.isRequired());
-            Assert.assertFalse(constraints.isUnique());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("NAME", attribute.getName());
-            Assert.assertEquals("String", attribute.getTypeName());
-
-            AttributeConstraints constraints = attribute.getConstraints();
-            Assert.assertTrue(constraints.isRequired());
-            Assert.assertFalse(constraints.isUnique());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("GEOMETRY", attribute.getName());
-            Assert.assertEquals("Geometry", attribute.getTypeName());
-
-            AttributeConstraints constraints = attribute.getConstraints();
-            Assert.assertFalse(constraints.isRequired());
-            Assert.assertFalse(constraints.isUnique());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-
-    }
-
-    /**
-     * Performs basic consistency checks on DocumentModel
-     *
-     * @param documentModel
-     */
-    private void assertIsValid(DocumentModel documentModel) {
-        List<FileModel> fileModels = documentModel.getFileModels();
-        for (FileModel fileModel : fileModels) {
-            Assert.assertNotNull(fileModel.getName());
-            Assert.assertNotNull(fileModel.getMandatory());
-            if (fileModel instanceof SingleTableModel) {
-                FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-                Assert.assertNotNull(featureType);
-                assertIsValid(featureType);
-            }
-        }
-    }
-
-    /**
-     * Performs basic consistency checks on FeatureType
-     *
-     * @param documentModel
-     */
-    private void assertIsValid(FeatureType featureType) {
-        Assert.assertFalse(StringUtils.isEmpty(featureType.getName()));
-
-        Assert.assertFalse(
-            "featureType must have at least one attribute",
-            featureType.getAttributeCount() == 0
-        );
-    }
-
-}
diff --git a/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java b/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java
index 65cecc85..2c60ce87 100644
--- a/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java
@@ -12,8 +12,8 @@
 
 import fr.ign.validator.Context;
 import fr.ign.validator.data.Document;
+import fr.ign.validator.io.JsonModelReader;
 import fr.ign.validator.io.ModelReader;
-import fr.ign.validator.io.XmlModelReader;
 import fr.ign.validator.model.DocumentModel;
 import fr.ign.validator.model.FeatureType;
 import fr.ign.validator.model.FileModel;
@@ -42,8 +42,8 @@ public void setUp() throws Exception {
         context.setProjection(Projection.CODE_CRS84);
         context.setReportBuilder(reportBuilder);
 
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/adresse/files.xml");
-        ModelReader modelLoader = new XmlModelReader();
+        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-json/adresse/files.json");
+        ModelReader modelLoader = new JsonModelReader();
         DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
 
         File documentPath = ResourceHelper.getResourceFile(getClass(), "/documents/adresse-multiple");
diff --git a/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java b/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java
index 776578bc..6242adc0 100644
--- a/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java
@@ -11,12 +11,13 @@ public class FileUtilsTest {
 
     @Test
     public void testListFilesAndDirs() {
-        File directory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File directory = ResourceHelper.getResourceFile(getClass(), "/documents/commune-sample");
         String[] extensions = {
             "xml"
         };
         Collection<File> files = FileUtils.listFilesAndDirs(directory, extensions);
-        assertEquals(4, files.size());
+        // 2 XML files and 1 sub-directory
+        assertEquals(3, files.size());
     }
 
 }
diff --git a/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java
index 9dbf22d0..9835c0c9 100644
--- a/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java
@@ -28,7 +28,7 @@ public void setUp() throws Exception {
 
         context = new Context();
         context.setStringFixer(StringFixer.createFullStringFixer(StandardCharsets.ISO_8859_1));
-        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/documents/adresse-multiple");
         context.setCurrentDirectory(currentDirectory);
 
         report = new InMemoryReportBuilder();
diff --git a/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java
index 18c689d1..7c784932 100644
--- a/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java
@@ -23,7 +23,7 @@ public void setUp() throws Exception {
         validator = new FilenameExistsValidator();
 
         context = new Context();
-        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/documents/commune-sample");
         context.setCurrentDirectory(currentDirectory);
 
         report = new InMemoryReportBuilder();
@@ -33,7 +33,7 @@ public void setUp() throws Exception {
     @Test
     public void testExisting() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("files.xml"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("commune.csv"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
@@ -41,7 +41,7 @@ public void testExisting() {
     @Test
     public void testExistingWithFragment() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("files.xml#page=15"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("commune.csv#page=15"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
@@ -49,7 +49,7 @@ public void testExistingWithFragment() {
     @Test
     public void testExistingInSubdirectory() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("COMMUNE.xml"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("a_file.pdf"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
@@ -57,7 +57,7 @@ public void testExistingInSubdirectory() {
     @Test
     public void testExistingInSubdirectoryWithFragment() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("COMMUNE.xml#page=15"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("a_file.pdf#page=15"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
diff --git a/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java
index 761a75b7..d7027739 100644
--- a/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java
@@ -23,7 +23,7 @@ public void setUp() throws Exception {
         validator = new DocumentFolderNameValidator();
 
         context = new Context();
-        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/documents/commune-sample");
         context.setCurrentDirectory(currentDirectory);
 
         report = new InMemoryReportBuilder();
diff --git a/validator-core/src/test/resources/config-xml/adresse/files.xml b/validator-core/src/test/resources/config-xml/adresse/files.xml
deleted file mode 100644
index 6c07922a..00000000
--- a/validator-core/src/test/resources/config-xml/adresse/files.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[]]></id>
-  <name><![CDATA[adresse]]></name>
-  <description><![CDATA[Sample configuration for adresse files)]]></description>
-  <regexp><![CDATA[+[a-Z]]]></regexp>
-  <files>
-    <file>
-      <id><![CDATA[]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[ADRESSE]]></name>
-      <path><![CDATA[ADRESSE(_+[0-9])?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/adresse/types/ADRESSE.xml b/validator-core/src/test/resources/config-xml/adresse/types/ADRESSE.xml
deleted file mode 100644
index 868f5c9c..00000000
--- a/validator-core/src/test/resources/config-xml/adresse/types/ADRESSE.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-	<typeName><![CDATA[ADRESSE]]></typeName>
-	<description><![CDATA[Table d'identifiant et adresse]]></description>
-	<attributes>
-		<attribute>
-			<id><![CDATA[64ab3e72aff3e5ddb155e943c9093cf2]]></id>
-			<name><![CDATA[ID]]></name>
-			<description><![CDATA[Identifiant unique]]></description>
-			<type><![CDATA[String]]></type>
-			<size>20</size>
-			<nullable>false</nullable>
-			<identifier>true</identifier>
-		</attribute>
-		<attribute>
-			<id><![CDATA[8e44a0bf8a2c4320e2274d9d565d154f]]></id>
-			<name><![CDATA[ADRESSE]]></name>
-			<description><![CDATA[Une adresse dans une ville]]></description>
-			<type><![CDATA[String]]></type>
-			<size>254</size>
-			<nullable>true</nullable>
-		</attribute>
-	</attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/files.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/files.xml
deleted file mode 100644
index 45805287..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/files.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[a92b92f73d59917d050de93dbb4e74c7]]></id>
-  <name><![CDATA[cnig_PLU_2014]]></name>
-  <description><![CDATA[cnig_PLU_2014]]></description>
-  <regexp><![CDATA[(2A|2B|[0-9]{2})[0-9]{3}_PLU_[0-9]{8}]]></regexp>
-  <files>
-    <file>
-      <id><![CDATA[03d497e82f490fe134cc661a3d0cabd1]]></id>
-      <type><![CDATA[metadata]]></type>
-      <name><![CDATA[METADONNEES]]></name>
-      <path><![CDATA[[^\\ ]*]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[81c765b004c69cfb88ea12e00ca42c63]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[DOC_URBA]]></name>
-      <path><![CDATA[DOC_URBA(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[bf55ae40cde2ff97c755bb4775da4374]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[DOC_URBA_COM]]></name>
-      <path><![CDATA[DOC_URBA_COM(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[1d61619430c0936912912668fb2aeb6a]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[Donnees_geographiques]]></name>
-      <path><![CDATA[Donnees_geographiques]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[57ae9bfeb037364c8e0de9eaf8b4431e]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_LIN]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_LIN(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[72da484d6634db30124a42d5cfb8fadb]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_PCT]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_PCT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[8e4388991dea2e969aac2b5b5fa74055]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_SURF]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_SURF(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[e786f3afc60b4234bcf79c82f27939e6]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_TXT]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_TXT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[9998c533ee7e24adfd15bff4d9bd4adb]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[INFO_LIN]]></name>
-      <path><![CDATA[Donnees_geographiques/INFO_LIN(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[e6a84a9d821a8f73f4a174fd2ba874f4]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[INFO_PCT]]></name>
-      <path><![CDATA[Donnees_geographiques/INFO_PCT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[357e29ca1bda8c52887373e0be176887]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[INFO_SURF]]></name>
-      <path><![CDATA[Donnees_geographiques/INFO_SURF(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[b1891ccf8c04f127064dbd8971d0ec63]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[PRESCRIPTION_LIN]]></name>
-      <path><![CDATA[Donnees_geographiques/PRESCRIPTION_LIN(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[eeee6c9903a753f2c8c6e9707b684707]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[PRESCRIPTION_PCT]]></name>
-      <path><![CDATA[Donnees_geographiques/PRESCRIPTION_PCT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[406748dfd7b28451647c6860dcfde056]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[PRESCRIPTION_SURF]]></name>
-      <path><![CDATA[Donnees_geographiques/PRESCRIPTION_SURF(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[766a513304de1a426a715048477f21b2]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[ZONE_URBA]]></name>
-      <path><![CDATA[Donnees_geographiques/ZONE_URBA(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[be6e359007473cbf458e53a6cd9ba911]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[Pieces_ecrites]]></name>
-      <path><![CDATA[Pieces_ecrites]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[0200a0ccc8b4f3ed52584db44366228f]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[0_Procedure]]></name>
-      <path><![CDATA[Pieces_ecrites/0_Procedure]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[d8c95096656b298ceb37138953f77d4a]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[PROCEDURE]]></name>
-      <path><![CDATA[Pieces_ecrites/0_Procedure/(2A|2B|[0-9]{2})[0-9]{3}_procedure_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[779fe97b71f9883dc7d97deb9b791eb2]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[1_Rapport_de_presentation]]></name>
-      <path><![CDATA[Pieces_ecrites/1_Rapport_de_presentation]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[94df13cff06bd6b15cb35bb0d564110a]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[EVALUATION_ENVIRONNEMENTALE]]></name>
-      <description><![CDATA[L'évaluation environnementale]]></description>
-      <path><![CDATA[Pieces_ecrites/1_Rapport_de_presentation/(2A|2B|[0-9]{2})[0-9]{3}_eval_environnement_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[844305554f8fbdcf589c3d68d8547015]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[RAPPORT]]></name>
-      <path><![CDATA[Pieces_ecrites/1_Rapport_de_presentation/(2A|2B|[0-9]{2})[0-9]{3}_rapport_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[ae66764446341c996a2cd35c67189927]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[2_PADD]]></name>
-      <path><![CDATA[Pieces_ecrites/2_PADD]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[4708bf1184e40ee7aa7b6d4f529331f0]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[PADD]]></name>
-      <path><![CDATA[Pieces_ecrites/2_PADD/(2A|2B|[0-9]{2})[0-9]{3}_(PADD|padd)_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[5cd1a84b342bce3bd66f3b99be1fe39e]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[3_Reglement]]></name>
-      <path><![CDATA[Pieces_ecrites/3_Reglement]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[a4ca0afdc13b260779c2e1f70aea4699]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[PRESCRIPTION]]></name>
-      <path><![CDATA[Pieces_ecrites/3_Reglement/(2A|2B|[0-9]{2})[0-9]{3}_prescription_(lin|pct|surf)(_[0-9]*)?_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[e78b5301e71be1f3a1accc9113a8558a]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[REGLEMENT]]></name>
-      <path><![CDATA[Pieces_ecrites/3_Reglement/(2A|2B|[0-9]{2})[0-9]{3}_reglement_[0-9]{8}]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[d4ed9e8634b669769bb6edc110efdddf]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[REGLEMENT_GRAPHIQUE]]></name>
-      <description><![CDATA[Le règlement graphique]]></description>
-      <path><![CDATA[Pieces_ecrites/3_Reglement/(2A|2B|[0-9]{2})[0-9]{3}_reglement_graphique_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[3d901b7e4c8a8f1b9ff4857003b694a2]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[4_Annexes]]></name>
-      <path><![CDATA[Pieces_ecrites/4_Annexes]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[b5acf1244eab8fb52691154859bd781d]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[ANNEXE]]></name>
-      <path><![CDATA[Pieces_ecrites/4_Annexes/[^\\ ]*]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[c01316f9ad0126a396980e4844330464]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[5_Orientations_amenagement]]></name>
-      <path><![CDATA[Pieces_ecrites/5_Orientations_amenagement]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[22afe8bc815eebdb665cef0b1f0be8aa]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[ORIENTATIONS_AMENAGEMENT]]></name>
-      <path><![CDATA[Pieces_ecrites/5_Orientations_amenagement/(2A|2B|[0-9]{2})[0-9]{3}_orientations_amenagement(_[0-9]*)?_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA.xml
deleted file mode 100644
index f631f6c9..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[205eca1b2044a921dbac103d5fcf0d08]]></id>
-  <typeName><![CDATA[DOC_URBA]]></typeName>
-  <description><![CDATA[Table contenant la liste des documents d'Urbanisme PLU ou POS dont la numérisation ou l'élaboration sous fourme numérique est engagée]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[00f76d2c413ce610f800bb6f4983b5e2]]></id>
-      <name><![CDATA[TYPEDOC]]></name>
-      <description><![CDATA[Type du document]]></description>
-      <type><![CDATA[String]]></type>
-      <size>4</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[PLU]]></value>
-        <value><![CDATA[POS]]></value>
-        <value><![CDATA[CC]]></value>
-        <value><![CDATA[PSMV]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[0d7b0df2bf4cdd729564cb51088f850d]]></id>
-      <name><![CDATA[URLREG]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier du règlement papier complet scanné]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[1fade0ff7214518c077ac4ff0dfecc43]]></id>
-      <name><![CDATA[ETAT]]></name>
-      <description><![CDATA[Etat juridique du document d'urbanisme]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[07]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[30a3e2766365644aa32dcecc56c8586e]]></id>
-      <name><![CDATA[INTERCO]]></name>
-      <description><![CDATA[Indique si le document d'urbanisme est intercommunal]]></description>
-      <type><![CDATA[String]]></type>
-      <size>1</size>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[36712f364f03614076085c3a8ab024ef]]></id>
-      <name><![CDATA[NOMREG]]></name>
-      <description><![CDATA[Nom du fichier contentant le document complet du règlement]]></description>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3f1c13456a973dbee0d4c9ca0e8cce3b]]></id>
-      <name><![CDATA[TYPEREF]]></name>
-      <description><![CDATA[Nom du référentiel cadastral utilisé pour la numérisation]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[45e9546221d3c62031155c07ac079194]]></id>
-      <name><![CDATA[NOMPLAN]]></name>
-      <description><![CDATA[Nom du fichier contenant le plan origine scanné. Il s'agit du plan sur lequel figure le tampon juridique]]></description>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[64ab3e72aff3e5ddb155e943c9093cf2]]></id>
-      <name><![CDATA[IDURBA]]></name>
-      <description><![CDATA[Identifiant unique du PLU]]></description>
-      <type><![CDATA[String]]></type>
-      <size>20</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[88b8ffe6394fd3938a99454a21540b90]]></id>
-      <name><![CDATA[SITEWEB]]></name>
-      <description><![CDATA[Page web du service de consultation du PLU offert par la collectivité locale]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8e44a0bf8a2c4320e2274d9d565d154f]]></id>
-      <name><![CDATA[URLPLAN]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier du plan scanné]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8f92993c402b6847086f59aa93d5afff]]></id>
-      <name><![CDATA[DATEFIN]]></name>
-      <description><![CDATA[Date de fin de validité du document d'urbanisme]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c83461113e9140b61084141ccad953aa]]></id>
-      <name><![CDATA[DATEREF]]></name>
-      <description><![CDATA[Date d'actualité ou de mise à jour du référentiel cadastral utilisé pour la création ou la numérisation des documents graphiques.]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ca28fcf3fdda6c32b67846d74bd1fd80]]></id>
-      <name><![CDATA[SIREN]]></name>
-      <description><![CDATA[Indique le numéro SIREN de l'intercommunalité ayant approuvé le PLU. Clé externe permettant de faire le lien avec la table des EPCI]]></description>
-      <type><![CDATA[String]]></type>
-      <size>9</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ddfaee1317a16639be4fdd0315ae74ae]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation administrative du document d'urbanisme]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA_COM.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA_COM.xml
deleted file mode 100644
index 38d35cbf..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA_COM.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[377c0c2802a542790275629eae444052]]></id>
-  <typeName><![CDATA[DOC_URBA_COM]]></typeName>
-  <description><![CDATA[Table contenant la liste des documents d'Urbanisme PLU ou POS dont la numérisation ou l'élaboration sous fourme numérique est engagée]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[40aa1f9bf1d55cbbf63780a7db6a819c]]></id>
-      <name><![CDATA[IDURBA]]></name>
-      <description><![CDATA[Identifiant unique du document d'urbanisme]]></description>
-      <type><![CDATA[String]]></type>
-      <size>20</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cb7ba3f93bd94eefc031b3759cf5c85c]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par le document d'urbanisme]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_LIN.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_LIN.xml
deleted file mode 100644
index 15f1751a..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_LIN.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[f161d27ac49c01923def5f6118a68750]]></id>
-  <typeName><![CDATA[HABILLAGE_LIN]]></typeName>
-  <description><![CDATA[Table des tracés linéaires indicatifs figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[341787f3300a17b0b8c6acb1406db369]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7fe3e5ff38c98598a44223387cee307e]]></id>
-      <name><![CDATA[NATTRAC]]></name>
-      <description><![CDATA[Nature de la ligne]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ee37b807932e3bd6f87b116cfb7c0118]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiLineString]]></type>
-      <size>-1</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_PCT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_PCT.xml
deleted file mode 100644
index 83b00a8b..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_PCT.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[63e18a45fa7db0a5571066f0a01994d1]]></id>
-  <typeName><![CDATA[HABILLAGE_PCT]]></typeName>
-  <description><![CDATA[Table des tracés ponctuels indicatifs figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[39c1e66f2b461c1d62d473aac982abc5]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[aa23e6cba32b49be704108f87595325d]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ad53cd403c9a45b65dd563b2f2413cae]]></id>
-      <name><![CDATA[NATTRAC]]></name>
-      <description><![CDATA[Nature du point]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_SURF.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_SURF.xml
deleted file mode 100644
index b3466121..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_SURF.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[df03a746402d7a7bee9b89cccc7fab47]]></id>
-  <typeName><![CDATA[HABILLAGE_SURF]]></typeName>
-  <description><![CDATA[Table des tracés surfaciques indicatifs figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[3b7e3c46398c3dfdb2962cfd00a97565]]></id>
-      <name><![CDATA[NATTRAC]]></name>
-      <description><![CDATA[Nature du polygon]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[471cf91b1e4483e53c5300a7b2c420a2]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a9d56307a55bc97c5ecb0321bdd4f17f]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_TXT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_TXT.xml
deleted file mode 100644
index 868d4796..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_TXT.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[6fcb857100febcfd31d8d43ebacd1c77]]></id>
-  <typeName><![CDATA[HABILLAGE_TXT]]></typeName>
-  <description><![CDATA[Table des objets textuels (étiquettes) figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0a7132d4ee719b5bbff4fe943d8a64ee]]></id>
-      <name><![CDATA[POLICE]]></name>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[27bf3bc9a34650a451488324abfec206]]></id>
-      <name><![CDATA[STYLE]]></name>
-      <description><![CDATA[Style d'écriture]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4f8440f89909120f8313300713b10637]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5a0dcb52fd2c7411479a8ba9a3011a55]]></id>
-      <name><![CDATA[TAILLE]]></name>
-      <description><![CDATA[Taille des caractères]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[862c091043a268256550a16714b39ca3]]></id>
-      <name><![CDATA[ANGLE]]></name>
-      <description><![CDATA[Angle de l'écriture exprimé en degré, par rapport à l'horizontale, dans le sens trigonométrique]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[98fbe6c33b931f9dc6d800659897593b]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9dc08fdd2f73d445257597e7993f6f5b]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Libellé de l'étiquette attachée au point d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c4268e2d3f473886eadc413f2da7e07d]]></id>
-      <name><![CDATA[NATECR]]></name>
-      <description><![CDATA[Nature de l'écriture]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_LIN.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_LIN.xml
deleted file mode 100644
index 9ba31603..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_LIN.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[33e6b6a82643433e039a853d5c6222c2]]></id>
-  <typeName><![CDATA[INFO_LIN]]></typeName>
-  <description><![CDATA[Table contenant les informations linéaires à reporter à titre d'information]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[001f293efacd8ec4c7c92d1f2d8c5317]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[46130ba4a3bbf72f9ed8e2f212f103c4]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de l'information servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7e65d773af1dce1b5379a2a157cf5295]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom complet de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[bb40d844d39f9d82f8b2225b61a3895a]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c22904a140649471e9ed359be676a804]]></id>
-      <name><![CDATA[TYPEINF]]></name>
-      <description><![CDATA[Type d'information linéaire dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c2878f08163dd9833e86d440d34b4249]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cb63ebb6ee2a017f692511cf1f078031]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier contenant le texte décrivant l'information reportée]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_PCT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_PCT.xml
deleted file mode 100644
index 50b6a028..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_PCT.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[d9e315c3de1de6f99683235d3ebc144a]]></id>
-  <typeName><![CDATA[INFO_PCT]]></typeName>
-  <description><![CDATA[Table contenant les informations ponctuelle à reporter à titre d'information]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[2f3146a9f28a85044005b6876bb372d4]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier contenant le texte décrivant l'information reportée]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[35b4011c916012f85fa4b116e1ae8cd1]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6471b663e6b10205b4859596e1a01842]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9423fc2ca70a794061a148ee43f10193]]></id>
-      <name><![CDATA[TYPEINF]]></name>
-      <description><![CDATA[Type d'information ponctuelle dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d689ae2f6c4549f59377f9837f19009c]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom complet de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ddbbad48547a3328d4cb769b16cc0c8f]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de l'information servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[de4c2bf4b0e71abf278086afc2f37866]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_SURF.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_SURF.xml
deleted file mode 100644
index 724a8bd8..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_SURF.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[518cd494c508f95fd2ccb3b6973ac0b8]]></id>
-  <typeName><![CDATA[INFO_SURF]]></typeName>
-  <description><![CDATA[INFO_SURF]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[6265b0019c821c9061e4d2adaf9855ce]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[83191b94625f3a08fef098883d4af232]]></id>
-      <name><![CDATA[TYPEINF]]></name>
-      <description><![CDATA[Type de périmètre dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[12]]></value>
-        <value><![CDATA[13]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[17]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[20]]></value>
-        <value><![CDATA[21]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[23]]></value>
-        <value><![CDATA[24]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[26]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[29]]></value>
-        <value><![CDATA[30]]></value>
-        <value><![CDATA[31]]></value>
-        <value><![CDATA[32]]></value>
-        <value><![CDATA[33]]></value>
-        <value><![CDATA[34]]></value>
-        <value><![CDATA[35]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8cc5f0b5fae22b8a5455d9e5b579467a]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court du périmètre servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b1588275b93688a773769b0057d5ebe3]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c37295a84cd77c37311111335350bd0b]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom complet du périmètre]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c4dd8b1956eb4c7fcb0991a4dc23f46e]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier contenant le texte décrivant l'information reportée]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[fec12f355f58f3a2b2224e166506a935]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_LIN.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_LIN.xml
deleted file mode 100644
index a53aadc7..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_LIN.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[df13ab0b8c53b0fd818a9641f1d8d51e]]></id>
-  <typeName><![CDATA[PRESCRIPTION_LIN]]></typeName>
-  <description><![CDATA[Table contenant les prescriptions linéaires se superposant au document d'urbanisme et le lien avec le texte qui la décrit]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[3790d4033a3b94bb9ebb2e1375d82970]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[58ab30e0cd729ecc56f039852564b92f]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5c2366ea4a3db81a21d3a551269f0485]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de la prescription servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7a61c865d25fc65ec7c42f1372212da8]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Intitulé complet de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b01794c449c755c0e00d78291ec538c1]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c3ca7a37846e4d1e8c8d28336d102a10]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ce15fbf5de358a793b1a0576edd92f41]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier PDF décrivant la prescription]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d513212d56dd313c67dfed47c7f606fd]]></id>
-      <name><![CDATA[TYPEPSC]]></name>
-      <description><![CDATA[Type de la prescription dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[21]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[24]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e77aaad29de92a25fff1d83494ee309d]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_PCT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_PCT.xml
deleted file mode 100644
index b0206859..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_PCT.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[d9447969363073652955af4fc7c1f7ea]]></id>
-  <typeName><![CDATA[PRESCRIPTION_PCT]]></typeName>
-  <description><![CDATA[Table contenant les prescriptions ponctuelles se superposant au document d'urbanisme et le lien avec le texte qui la décrit]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[10bc86ddbd845b55da93c4614f194cfc]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[54fbf5a3e4962ea52b5b9cfb0fc31edd]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier PDF décrivant la prescription]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[688a2b26c9812fc15fca3bc2c23a27bc]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Intitulé complet de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[68af4a37dbca7a70309c33390f97dbce]]></id>
-      <name><![CDATA[TYPEPSC]]></name>
-      <description><![CDATA[Type de la prescription dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6fe5a45d37caa669fc38934c137094e0]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[781057cab7870a1664eba1327e78b803]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[85a68a878a5cb30dbb3fbd4e7017dfa1]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[af1efeb32bda9816f9b4f1dda3032d5e]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b4c8c9512ef5c99cbebca54dcd206030]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de la prescription servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_SURF.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_SURF.xml
deleted file mode 100644
index c1e1c495..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_SURF.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[1df44911a69fd617250dda6e75f3f5ff]]></id>
-  <typeName><![CDATA[PRESCRIPTION_SURF]]></typeName>
-  <description><![CDATA[Table contenant les prescriptions surfaciques se superposant au document d'urbanisme et le lien avec le texte qui la décrit]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[133430b5c5eb48a7052662bcc86eb054]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[15af7a7b61ce458c1ca857a839d4d592]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[175001591209bb41e8f0e31b73d45655]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[50c9bac37692efac7793f8e9eeb5214a]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier PDF décrivant la prescription]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[788c2edeb9bf6018ca62d80793efafa5]]></id>
-      <name><![CDATA[TYPEPSC]]></name>
-      <description><![CDATA[Type de la prescription dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[12]]></value>
-        <value><![CDATA[13]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[17]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[20]]></value>
-        <value><![CDATA[21]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[23]]></value>
-        <value><![CDATA[24]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[26]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[29]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7b910d70d56b296c8fad55039e65e539]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Intitulé complet de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[90657d31230e3344e3651a11ccbd4c3b]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de la prescription servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a42e9b4fc6a019049cbca20735b77822]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[aa6b5c23c7ba2bc8f611d49d6016f30d]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/ZONE_URBA.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/ZONE_URBA.xml
deleted file mode 100644
index ce9ed74d..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/ZONE_URBA.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[353f879824ced4083ff0726b606e3b5b]]></id>
-  <typeName><![CDATA[ZONE_URBA]]></typeName>
-  <description><![CDATA[Table contenant les zones d'un document PLU ou POS]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[48c561dd3880fb1ee722528bd5e9a96a]]></id>
-      <name><![CDATA[DESTDOMI]]></name>
-      <description><![CDATA[Vocation dominante de la zone, concerne l’usage de la zone]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[00]]></value>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4ea2f72750bdb441eb3ba537302673b8]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune couverte par la zone]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[778abd5f2cc00db7e71c87b4067f443e]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la zone ou à défaut du règlement intégral indexé]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[83d6f8154193665a2d1a1745173cee04]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier du règlement de la zone]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8b3566b1dc53dfe2920966bb62981663]]></id>
-      <name><![CDATA[LIBELONG]]></name>
-      <description><![CDATA[Nom complet littéral de la zone tel qu’il apparaît dans le chapitre du règlement écrit]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a737537117f70442737583f560eddf09]]></id>
-      <name><![CDATA[TYPEZONE]]></name>
-      <description><![CDATA[Type de la zone dans une nomenclature simplifiée]]></description>
-      <type><![CDATA[String]]></type>
-      <size>3</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[U]]></value>
-        <value><![CDATA[AUc]]></value>
-        <value><![CDATA[AUs]]></value>
-        <value><![CDATA[A]]></value>
-        <value><![CDATA[N]]></value>
-        <value><![CDATA[Nh]]></value>
-        <value><![CDATA[Nd]]></value>
-        <value><![CDATA[Ah]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b0e4bc2b4d3f3c1da7e8e9d850b71fd6]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la zone]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b295ea213d1c74dadac7511da195651b]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la zone ou de son règlement]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e91ea5c358d4262af96fd5bc0fda3cda]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom court de la zone tel qu’il apparaît sur le plan de zonage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>12</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[f96a702bafbe4132ff9a8431fb3571bb]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/geofla/files.xml b/validator-core/src/test/resources/config-xml/geofla/files.xml
deleted file mode 100644
index 5ca355a9..00000000
--- a/validator-core/src/test/resources/config-xml/geofla/files.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id>788</id>
-  <name><![CDATA[GEOFLA]]></name>
-  <description><![CDATA[Exemple de modèle de document]]></description>
-  <files>
-    <file>
-      <id>8766</id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[COMMUNE]]></name>
-      <description><![CDATA[Communes dans les fichiers GEOFLA]]></description>
-      <path><![CDATA[COMMUNE]]></path>
-      <mandatory>OPTIONAL</mandatory>
-    </file>
-    <file>
-      <id>8766</id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[LIMITE_COMMUNE]]></name>
-      <description><![CDATA[Limite des communes dans les fichiers GEOFLA]]></description>
-      <path><![CDATA[LIMITE_COMMUNE]]></path>
-      <mandatory>OPTIONAL</mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/geofla/types/COMMUNE.xml b/validator-core/src/test/resources/config-xml/geofla/types/COMMUNE.xml
deleted file mode 100644
index 09624924..00000000
--- a/validator-core/src/test/resources/config-xml/geofla/types/COMMUNE.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<featureType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<typeName>COMMUNE</typeName>
-    <attributes>
-        <attribute>
-            <name>GEOMETRY</name>
-            <type>Geometry</type>
-            <definition>GEOMETRY</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>ID_GEOFLA</name>
-            <type>String</type>
-            <definition>ID_GEOFLA</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_COM</name>
-            <type>String</type>
-            <definition>CODE_COM</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>INSEE_COM</name>
-            <type>String</type>
-            <definition>INSEE_COM</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NOM_COM</name>
-            <type>String</type>
-            <definition>NOM_COM</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>STATUT</name>
-            <type>String</type>
-            <definition>STATUT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>X_CHF_LIEU</name>
-            <type>String</type>
-            <definition>X_CHF_LIEU</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>Y_CHF_LIEU</name>
-            <type>String</type>
-            <definition>Y_CHF_LIEU</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>X_CENTROID</name>
-            <type>String</type>
-            <definition>X_CENTROID</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>Y_CENTROID</name>
-            <type>String</type>
-            <definition>Y_CENTROID</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>Z_MOYEN</name>
-            <type>String</type>
-            <definition>Z_MOYEN</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>SUPERFICIE</name>
-            <type>String</type>
-            <definition>SUPERFICIE</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>POPULATION</name>
-            <type>String</type>
-            <definition>POPULATION</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_CANT</name>
-            <type>String</type>
-            <definition>CODE_CANT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_ARR</name>
-            <type>String</type>
-            <definition>CODE_ARR</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_DEPT</name>
-            <type>String</type>
-            <definition>CODE_DEPT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NOM_DEPT</name>
-            <type>String</type>
-            <definition>NOM_DEPT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_REG</name>
-            <type>String</type>
-            <definition>CODE_REG</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NOM_REG</name>
-            <type>String</type>
-            <definition>NOM_REG</definition>
-            <nullable>false</nullable>
-        </attribute>
-    </attributes>
-</featureType>
-
diff --git a/validator-core/src/test/resources/config-xml/geofla/types/LIMITE_COMMUNE.xml b/validator-core/src/test/resources/config-xml/geofla/types/LIMITE_COMMUNE.xml
deleted file mode 100644
index fd0345b6..00000000
--- a/validator-core/src/test/resources/config-xml/geofla/types/LIMITE_COMMUNE.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<featureType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<typeName>LIMITE_COMMUNE</typeName>
-    <attributes>
-        <attribute>
-            <name>GEOMETRY</name>
-            <type>Geometry</type>
-            <definition>GEOMETRY</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>ID_GEOFLA</name>
-            <type>String</type>
-            <definition>ID_GEOFLA</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NATURE</name>
-            <type>String</type>
-            <definition>NATURE</definition>
-            <nullable>false</nullable>
-        </attribute>
-    </attributes>
-</featureType>
\ No newline at end of file
diff --git a/validator-core/src/test/resources/config-xml/missing_feature_type/files.xml b/validator-core/src/test/resources/config-xml/missing_feature_type/files.xml
deleted file mode 100644
index 14a72dc9..00000000
--- a/validator-core/src/test/resources/config-xml/missing_feature_type/files.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[]]></id>
-  <name><![CDATA[missing_feature_type]]></name>
-  <description><![CDATA[Sample configuration with a missing FeatureType)]]></description>
-  <regexp><![CDATA[+[a-Z]]]></regexp>
-  <files>
-    <file>
-      <id><![CDATA[]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[MY_TABLE]]></name>
-      <path><![CDATA[MY_TABLE]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/sample-document/files.xml b/validator-core/src/test/resources/config-xml/sample-document/files.xml
deleted file mode 100644
index 2c5ff628..00000000
--- a/validator-core/src/test/resources/config-xml/sample-document/files.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<document>
-    <name>ccccc_CC_dddddddd</name>
-    <regexp>[0-9]{5}_CC_[0-9]{8}</regexp>
-    <files>
-        <file>
-            <name>SIMPLE</name>
-            <type>table</type>
-            <path>(N_)?SIMPLE(_(02A|02B|[0-9]{3}))?</path>
-            <mandatory>WARN</mandatory>
-        </file>
-        <file>
-            <name>Donnees_geographiques</name>
-            <type>directory</type>
-            <path>Donnees_geographiques</path>
-            <mandatory>ERROR</mandatory>
-        </file>
-        <file>
-            <name>COMMUNE</name>
-            <type>table</type>
-            <path>Donnees_geographiques/(N_)?COMMUNE(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?</path>
-            <mandatory>WARN</mandatory>
-        </file>
-    </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/sample-document/types/COMMUNE.xml b/validator-core/src/test/resources/config-xml/sample-document/types/COMMUNE.xml
deleted file mode 100644
index 90fd523a..00000000
--- a/validator-core/src/test/resources/config-xml/sample-document/types/COMMUNE.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<featureType>
-    <typeName>COMMUNE</typeName>
-    <description>La table des communes</description>
-    <attributes>
-        <attribute>
-            <name>INSEE</name>
-            <type>String</type>
-            <regexp>[0-9]{5}</regexp>
-            <nullable>false</nullable>
-            <identifier>true</identifier>
-        </attribute>
-        <attribute>
-            <name>CODE_DEPT</name>
-            <type>String</type>
-            <nullable>false</nullable>
-            <identifier>false</identifier>
-            <listOfValues>
-                <value>01</value>
-                <value>02</value>
-            </listOfValues>
-        </attribute>
-        <attribute>
-            <name>DETRUIT</name>
-            <type>Boolean</type>
-            <nullable>true</nullable>
-            <identifier>false</identifier>
-        </attribute>
-    </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/sample-document/types/SIMPLE.xml b/validator-core/src/test/resources/config-xml/sample-document/types/SIMPLE.xml
deleted file mode 100644
index 93b5ce43..00000000
--- a/validator-core/src/test/resources/config-xml/sample-document/types/SIMPLE.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id>64594</id>
-  <typeName><![CDATA[SIMPLE]]></typeName>
-  <description><![CDATA[TABLE TEST]]></description>
-  <attributes>
-    <attribute>
-      <id>130278</id>
-      <name><![CDATA[ID]]></name>
-      <description><![CDATA[Identifiant]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id>130279</id>
-      <name><![CDATA[NAME]]></name>
-      <description><![CDATA[Nom]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id>130280</id>
-      <name><![CDATA[GEOMETRY]]></name>
-      <type><![CDATA[Geometry]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-  <document_model>
-    <id>786</id>
-    <name><![CDATA[TEST]]></name>
-    <description><![CDATA[TEST]]></description>
-    <featureTypes>
-      <featureType/>
-    </featureTypes>
-  </document_model>
-</featureType>
-
diff --git a/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv b/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv
index 0f0e3e36..2fa253cb 100644
--- a/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv
+++ b/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv
@@ -1,9 +1,9 @@
-ID,ADRESSE
-1,"adresse bidon, Paris"
-5,"adresse du 15ième, Paris"
-2,"adresse au soleil, Montpellier"
-3,"adresse sympa, Montpellier"
-4,"adresse sous la pluie, Brest"
-7,"adresse d'un pub, Brest"
-6,
-7,
+ID,ADRESSE,HOMEPAGE
+1,"adresse bidon, Paris",
+5,"adresse du 15ième, Paris",
+2,"adresse au soleil, Montpellier",
+3,"adresse sympa, Montpellier",
+4,"adresse sous la pluie, Brest",
+7,"adresse d'un pub, Brest",
+6,,
+7,,
diff --git a/validator-plugin-cnig/pom.xml b/validator-plugin-cnig/pom.xml
index ae5450ba..7cae95f7 100644
--- a/validator-plugin-cnig/pom.xml
+++ b/validator-plugin-cnig/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>fr.ign.validator</groupId>
 		<artifactId>validator</artifactId>
-		<version>4.4.6-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<name>validator-plugin-cnig</name>
 	<artifactId>validator-plugin-cnig</artifactId>
diff --git a/validator-plugin-dgpr/pom.xml b/validator-plugin-dgpr/pom.xml
index 5d570271..c16f1fbc 100644
--- a/validator-plugin-dgpr/pom.xml
+++ b/validator-plugin-dgpr/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>fr.ign.validator</groupId>
     <artifactId>validator</artifactId>
-    <version>4.4.6-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <name>validator-plugin-dgpr</name>
diff --git a/validator-plugin-dgpr/src/test/java/fr/ign/validator/DgprApplicationTest.java b/validator-plugin-dgpr/src/test/java/fr/ign/validator/DgprApplicationTest.java
index c035ea51..3794febf 100644
--- a/validator-plugin-dgpr/src/test/java/fr/ign/validator/DgprApplicationTest.java
+++ b/validator-plugin-dgpr/src/test/java/fr/ign/validator/DgprApplicationTest.java
@@ -18,8 +18,8 @@
 import fr.ign.validator.dgpr.error.DgprErrorCodes;
 import fr.ign.validator.error.CoreErrorCodes;
 import fr.ign.validator.error.ValidatorError;
+import fr.ign.validator.io.JsonModelReader;
 import fr.ign.validator.io.ModelReader;
-import fr.ign.validator.io.XmlModelReader;
 import fr.ign.validator.model.DocumentModel;
 import fr.ign.validator.plugin.PluginManager;
 import fr.ign.validator.report.InMemoryReportBuilder;
@@ -57,9 +57,9 @@ private Context createContext(File documentPath) throws Exception {
 
     private DocumentModel getDocumentModel(String documentModelName) throws Exception {
         File documentModelPath = new File(
-            getClass().getResource("/config/" + documentModelName + "/files.xml").getPath()
+            getClass().getResource("/config/" + documentModelName + "/files.json").getPath()
         );
-        ModelReader loader = new XmlModelReader();
+        ModelReader loader = new JsonModelReader();
         DocumentModel documentModel = loader.loadDocumentModel(documentModelPath);
         documentModel.setName(documentModelName);
         return documentModel;
@@ -224,18 +224,13 @@ public void testDocumentNotOk() throws Exception {
         /*
          * Validation unicite et relation
          */
-        Assert.assertEquals(2, report.getErrorsByCode(CoreErrorCodes.ATTRIBUTE_NOT_UNIQUE).size());
+        Assert.assertEquals(1, report.getErrorsByCode(CoreErrorCodes.ATTRIBUTE_NOT_UNIQUE).size());
         ValidatorError error50 = report.getErrorsByCode(CoreErrorCodes.ATTRIBUTE_NOT_UNIQUE).get(0);
-        ValidatorError error51 = report.getErrorsByCode(CoreErrorCodes.ATTRIBUTE_NOT_UNIQUE).get(1);
         Assert.assertEquals(
             "La valeur 'ZE_2' est présente 2 fois pour le champ 'ID_ZONE' de la table 'N_prefixTri_ECOUL_S_ddd'.",
             error50
                 .getMessage()
         );
-        Assert.assertEquals(
-            "La valeur 'SIEXT' est présente 2 fois pour le champ 'ID_SI_EXT' de la table 'N_prefixTri_ENJEU_CRISE_L_ddd'.",
-            error51.getMessage()
-        );
 
         Assert.assertEquals(5, report.getErrorsByCode(CoreErrorCodes.ATTRIBUTE_REFERENCE_NOT_FOUND).size());
         {
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/files.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/files.json
new file mode 100644
index 00000000..747aedaa
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/files.json
@@ -0,0 +1,235 @@
+{
+    "id": "48cbe0573f476664353c7bd681f5f2e6",
+    "name": "covadis_di_2018",
+    "title": "covadis_di_2018",
+    "constraints": {
+        "folderName": "covadis_di_2018"
+    },
+    "files": [
+        {
+            "id": "0e7c86cd915a7415cefc53ea9a407c6f",
+            "name": "N_prefixTri_CARTE_INOND_S_ddd",
+            "path": "N_.*_CARTE_INOND_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "ERROR",
+            "tableModel": "./types/N_prefixTri_CARTE_INOND_S_ddd.json"
+        },
+        {
+            "id": "7c97fa921538c84cc7fbd91438c6bba1",
+            "name": "N_prefixTri_CARTE_RISQ_S_ddd",
+            "path": "N_.*_CARTE_RISQ_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "ERROR",
+            "tableModel": "./types/N_prefixTri_CARTE_RISQ_S_ddd.json"
+        },
+        {
+            "id": "6e52a672e8fdcdd94bb05c5348b50a0d",
+            "name": "N_prefixTri_CHAMP_VIT_P_ddd",
+            "path": "N_.*_CHAMP_VIT_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_CHAMP_VIT_P_ddd.json"
+        },
+        {
+            "id": "3a4280fa81164b503e34c18ad27ea983",
+            "name": "N_prefixTri_COMMUNE_S_ddd",
+            "path": "N_.*_COMMUNE_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "ERROR",
+            "tableModel": "./types/N_prefixTri_COMMUNE_S_ddd.json"
+        },
+        {
+            "id": "5f6a3a2ddcf817c2ad6fa011a19086ef",
+            "name": "N_prefixTri_COTE_VIT_DEB_P_ddd",
+            "path": "N_.*_COTE_VIT_DEB_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_COTE_VIT_DEB_P_ddd.json"
+        },
+        {
+            "id": "cdebef0459bb55ea438eaabd81507042",
+            "name": "N_prefixTri_ECOUL_S_ddd",
+            "path": "N_.*_ECOUL_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ECOUL_S_ddd.json"
+        },
+        {
+            "id": "021c6604a641341149e735fc5a8effe9",
+            "name": "N_prefixTri_ENJEU_CRISE_L_ddd",
+            "path": "N_.*_ENJEU_CRISE_L_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_CRISE_L_ddd.json"
+        },
+        {
+            "id": "d9eed1c0ac1e5fe34707b8f27a009e1b",
+            "name": "N_prefixTri_ENJEU_CRISE_P_ddd",
+            "path": "N_.*_ENJEU_CRISE_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_CRISE_P_ddd.json"
+        },
+        {
+            "id": "bd0ec953d2abdef1f6b1162317ff455e",
+            "name": "N_prefixTri_ENJEU_DCE_S_ddd",
+            "path": "N_.*_ENJEU_DCE_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_DCE_S_ddd.json"
+        },
+        {
+            "id": "a7e563e428d621dcff52a9be7f632dfb",
+            "name": "N_prefixTri_ENJEU_ECO_S_ddd",
+            "path": "N_.*_ENJEU_ECO_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_ECO_S_ddd.json"
+        },
+        {
+            "id": "73aff52a9bbf6ae952e8558551c3d6a9",
+            "name": "N_prefixTri_ENJEU_IED_P_ddd",
+            "path": "N_.*_ENJEU_IED_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_IED_P_ddd.json"
+        },
+        {
+            "id": "b6994affac1341487569541b0f17a5d0",
+            "name": "N_prefixTri_ENJEU_IPPC_P_ddd",
+            "path": "N_.*_ENJEU_IPPC_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_IPPC_P_ddd.json"
+        },
+        {
+            "id": "6c6d5bad08e5f02b5751a0e3d2b04e82",
+            "name": "N_prefixTri_ENJEU_PATRIM_P_ddd",
+            "path": "N_.*_ENJEU_PATRIM_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_PATRIM_P_ddd.json"
+        },
+        {
+            "id": "2020f026513bae8cc51a0b968cb84c17",
+            "name": "N_prefixTri_ENJEU_PATRIM_S_ddd",
+            "path": "N_.*_ENJEU_PATRIM_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_PATRIM_S_ddd.json"
+        },
+        {
+            "id": "857dd96adbd090301e82c842120c99a5",
+            "name": "N_prefixTri_ENJEU_RAPPORT_ddd",
+            "path": "N_.*_ENJEU_RAPPORT_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "ERROR",
+            "tableModel": "./types/N_prefixTri_ENJEU_RAPPORT_ddd.json"
+        },
+        {
+            "id": "2234886dac757579eef0a63242009ba2",
+            "name": "N_prefixTri_ENJEU_STEU_P_ddd",
+            "path": "N_.*_ENJEU_STEU_P_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ENJEU_STEU_P_ddd.json"
+        },
+        {
+            "id": "1e2cafc2097fb78aa2d537a37710e651",
+            "name": "N_prefixTri_INONDABLE_suffixInond_S_ddd",
+            "path": "N_.*_INONDABLE.{0,20}_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "ERROR",
+            "tableModel": "./types/N_prefixTri_INONDABLE_suffixInond_S_ddd.json"
+        },
+        {
+            "id": "697103129ce2c43441108a1a24c3fe2c",
+            "name": "N_prefixTri_ISO_COTE_L_ddd",
+            "path": "N_.*_ISO_COTE_L_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ISO_COTE_L_ddd.json"
+        },
+        {
+            "id": "3a2919cd29f71c7bd128338d81e673e9",
+            "name": "N_prefixTri_ISO_DEB_S_ddd",
+            "path": "N_.*_ISO_DEB_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ISO_DEB_S_ddd.json"
+        },
+        {
+            "id": "2e6ba626adad1741fa1c93a1bce976e8",
+            "name": "N_prefixTri_ISO_HT_suffixIsoHt_S_ddd",
+            "path": "N_.*_ISO_HT.{0,20}_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "WARN",
+            "tableModel": "./types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.json"
+        },
+        {
+            "id": "cea63601540c8f2efe96a0cdce2a87fc",
+            "name": "N_prefixTri_OUV_PROTEC_L_ddd",
+            "path": "N_.*_OUV_PROTEC_L_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_OUV_PROTEC_L_ddd.json"
+        },
+        {
+            "id": "4c35064b6f886e6be9cbb5a2bcfc790e",
+            "name": "N_prefixTri_QUARTIER_S_ddd",
+            "path": "N_.*_QUARTIER_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_QUARTIER_S_ddd.json"
+        },
+        {
+            "id": "272aca26b80f291e7619b676b67d2090",
+            "name": "N_prefixTri_REL_HYDRO_INOND_ddd",
+            "path": "N_.*_REL_HYDRO_INOND_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_REL_HYDRO_INOND_ddd.json"
+        },
+        {
+            "id": "d8bb8e3af88bc50545c31e93245c412f",
+            "name": "N_prefixTri_SOUST_INOND_S_ddd",
+            "path": "N_.*_SOUST_INOND_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_SOUST_INOND_S_ddd.json"
+        },
+        {
+            "id": "08651fdaeca64491459a6b84c2bc7ed3",
+            "name": "N_prefixTri_SURALEA_S_ddd",
+            "path": "N_.*_SURALEA_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_SURALEA_S_ddd.json"
+        },
+        {
+            "id": "78025b58452cdde41cb38b9c862f40e2",
+            "name": "N_prefixTri_TRI_S_ddd",
+            "path": "N_.*_TRI_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "ERROR",
+            "tableModel": "./types/N_prefixTri_TRI_S_ddd.json"
+        },
+        {
+            "id": "ea8bfabc1da69aed45cb8766cde19c62",
+            "name": "N_prefixTri_ZONE_PROTEG_S_ddd",
+            "path": "N_.*_ZONE_PROTEG_S_([0-9]{3}|02[aA]|02[bB])",
+            "type": "table",
+            "mandatory": "OPTIONAL",
+            "tableModel": "./types/N_prefixTri_ZONE_PROTEG_S_ddd.json"
+        },
+        {
+            "id": "f107d77b75049a44284d3a0f6d6e411f",
+            "name": "prefixTri_SIG_DI",
+            "description": "repertoire",
+            "path": ".*_SIG_DI",
+            "type": "directory",
+            "mandatory": "OPTIONAL"
+        }
+    ],
+    "codes": []
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/files.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/files.xml
deleted file mode 100644
index a4f5633c..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/files.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[48cbe0573f476664353c7bd681f5f2e6]]></id>
-  <name><![CDATA[covadis_di_2018]]></name>
-  <files>
-    <file>
-      <path><![CDATA[N_.*_CARTE_INOND_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[0e7c86cd915a7415cefc53ea9a407c6f]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_CARTE_INOND_S_ddd]]></name>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_CARTE_RISQ_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[7c97fa921538c84cc7fbd91438c6bba1]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_CARTE_RISQ_S_ddd]]></name>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_CHAMP_VIT_P_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[6e52a672e8fdcdd94bb05c5348b50a0d]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_CHAMP_VIT_P_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_COMMUNE_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[3a4280fa81164b503e34c18ad27ea983]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_COMMUNE_S_ddd]]></name>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_COTE_VIT_DEB_P_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[5f6a3a2ddcf817c2ad6fa011a19086ef]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_COTE_VIT_DEB_P_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ECOUL_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[cdebef0459bb55ea438eaabd81507042]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ECOUL_S_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_CRISE_L_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[021c6604a641341149e735fc5a8effe9]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_CRISE_L_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_CRISE_P_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[d9eed1c0ac1e5fe34707b8f27a009e1b]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_CRISE_P_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_DCE_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[bd0ec953d2abdef1f6b1162317ff455e]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_DCE_S_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_ECO_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[a7e563e428d621dcff52a9be7f632dfb]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_ECO_S_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_IPPC_P_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[b6994affac1341487569541b0f17a5d0]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_IPPC_P_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_PATRIM_P_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[6c6d5bad08e5f02b5751a0e3d2b04e82]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_PATRIM_P_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_PATRIM_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[2020f026513bae8cc51a0b968cb84c17]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_PATRIM_S_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_RAPPORT_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[857dd96adbd090301e82c842120c99a5]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_RAPPORT_ddd]]></name>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ENJEU_STEU_P_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[2234886dac757579eef0a63242009ba2]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ENJEU_STEU_P_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_INONDABLE.{0,20}_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[1e2cafc2097fb78aa2d537a37710e651]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd]]></name>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ISO_COTE_L_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[697103129ce2c43441108a1a24c3fe2c]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ISO_COTE_L_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ISO_DEB_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[3a2919cd29f71c7bd128338d81e673e9]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ISO_DEB_S_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_ISO_HT.{0,20}_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[2e6ba626adad1741fa1c93a1bce976e8]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_ISO_HT_suffixIsoHt_S_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_OUV_PROTEC_L_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[cea63601540c8f2efe96a0cdce2a87fc]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_OUV_PROTEC_L_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_QUARTIER_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[4c35064b6f886e6be9cbb5a2bcfc790e]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_QUARTIER_S_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_REL_HYDRO_INOND_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[272aca26b80f291e7619b676b67d2090]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_REL_HYDRO_INOND_ddd]]></name>
-      <mandatory><![CDATA[WARN]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_SOUST_INOND_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[d8bb8e3af88bc50545c31e93245c412f]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_SOUST_INOND_S_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_SURALEA_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[08651fdaeca64491459a6b84c2bc7ed3]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_SURALEA_S_ddd]]></name>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[N_.*_TRI_S_([0-9]{3}|02[aA]|02[bB])]]></path>
-      <id><![CDATA[78025b58452cdde41cb38b9c862f40e2]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[N_prefixTri_TRI_S_ddd]]></name>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <path><![CDATA[.*_SIG_DI]]></path>
-      <id><![CDATA[f107d77b75049a44284d3a0f6d6e411f]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[prefixTri_SIG_DI]]></name>
-      <description><![CDATA[repertoire]]></description>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-  </files>
-  <default_model>true</default_model>
-</document>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_INOND_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_INOND_S_ddd.json
new file mode 100644
index 00000000..f12de37c
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_INOND_S_ddd.json
@@ -0,0 +1,124 @@
+{
+    "id": "a2b8bfebc23b2e9ff86666a5317f3026",
+    "name": "N_prefixTri_CARTE_INOND_S_ddd",
+    "columns": [
+        {
+            "id": "0517a3d56312a29ac420ce7cb770c193",
+            "name": "TYP_INOND1",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "191da4fe8e998f772102b8a1ef140cbf",
+            "name": "TYP_INOND2",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "396e89a06c6b62295a04d4407909f276",
+            "name": "SCENARIO",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "74ba6cfe17c69c3d22bc099fedfed640",
+            "name": "DATFINVAL",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "8ac0994afe17fb3288825ef4a5c7c43a",
+            "name": "ID_TRI",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "944c6cd7cc419a26472ebbfcd265d1d5",
+            "name": "URLRAPPORT",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 254
+            }
+        },
+        {
+            "id": "b2031b1c0921bdbf948823fdd5e8de95",
+            "name": "EST_SYNTH",
+            "type": "Boolean",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "b6b35d5d577158289011a78459eea12e",
+            "name": "DATAPPRO",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d0a3f10cba77397ef3ded392bf6c8fe2",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "e687dab359fc6c2e1b31c500048ed830",
+            "name": "ID_CARTE",
+            "description": "- COVADIS B1.2. - Identifiant de type 'CSI_[numero automatique]'",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "CSI_[0-9]+$",
+                "maxLength": 30
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_INOND_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_INOND_S_ddd.xml
deleted file mode 100644
index 3f3558d3..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_INOND_S_ddd.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[f9982c61b4db0242fd0f4ffe7962ba51]]></id>
-  <typeName><![CDATA[N_prefixTri_CARTE_INOND_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0114cca8e4edb73c2f403059664ed356]]></id>
-      <name><![CDATA[DATFINVAL]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[225a52335092ce4a3882b69a6068957c]]></id>
-      <name><![CDATA[EST_SYNTH]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3f377525f07118cdfa155c1a4bc533a0]]></id>
-      <name><![CDATA[URLRAPPORT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[45d89719ff036b10fc76b4e5296d3769]]></id>
-      <name><![CDATA[TYP_INOND2]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[CSI_[0-9]+$]]></regexp>
-      <id><![CDATA[5834111621d0809d8864ca9abc795026]]></id>
-      <name><![CDATA[ID_CARTE]]></name>
-      <description><![CDATA[- COVADIS B1.2. - Identifiant de type 'CSI_[numero automatique]']]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8688946e99eea31499e657ec8cd54831]]></id>
-      <name><![CDATA[TYP_INOND1]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9236cd319a2d5b4d78a248d22508b66b]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b943ce4ba8f977e4e4fc3560760dc0b3]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[df4004827043b87bf9f724d406e6e7b7]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[fef801211e1885f1459233d6c516fc0c]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[04Faicc_ct]]></value>
-        <value><![CDATA[01Forcc_ct]]></value>
-        <value><![CDATA[01Forcc_100]]></value>
-        <value><![CDATA[03Mcc_ct]]></value>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_RISQ_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_RISQ_S_ddd.json
new file mode 100644
index 00000000..cd9563dc
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_RISQ_S_ddd.json
@@ -0,0 +1,67 @@
+{
+    "id": "08184a2768da79cf74ec4f3ed15ce68d",
+    "name": "N_prefixTri_CARTE_RISQ_S_ddd",
+    "columns": [
+        {
+            "id": "1bd2a37619e39921a37032f9a35d3f61",
+            "name": "DATFINVAL",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "33d6bf13c85b065a47debdbedb28e922",
+            "name": "DATAPPRO",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "36f7b243777e8a3f311cf4ed01965c50",
+            "name": "ID_TRI",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "af04c65418d8e5fd18045c2a6414cf65",
+            "name": "ID_CARTE",
+            "description": "COVADIS B1.2. - Identifiant de type CRI_[numero]",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "CRI_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "b952bcc9638681312dcffe31e4cb3e92",
+            "name": "URLRAPPORT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 254
+            }
+        },
+        {
+            "id": "dc29321dd26d263e3521ff18a7c5949f",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_RISQ_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_RISQ_S_ddd.xml
deleted file mode 100644
index 49d8b95b..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CARTE_RISQ_S_ddd.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[2a1263cd00b42f75d03c0afab9d7ddfc]]></id>
-  <typeName><![CDATA[N_prefixTri_CARTE_RISQ_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <regexp><![CDATA[CRI_[0-9]+$]]></regexp>
-      <id><![CDATA[22c0b17021825ab18b03b67d9823aa5e]]></id>
-      <name><![CDATA[ID_CARTE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type CRI_[numero]]]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[2af1cc82406ae7fde56e5ac019cebc4f]]></id>
-      <name><![CDATA[DATFINVAL]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[554716eb38ea85f72331995857edee08]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6f4727ef14142ba292b2bbe4ea24d1df]]></id>
-      <name><![CDATA[URLRAPPORT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7b4c70160032f729ea925314a7a998cc]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c98384b5b27f3811c1241d0c55296dc4]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CHAMP_VIT_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CHAMP_VIT_P_ddd.json
new file mode 100644
index 00000000..a78ab9f5
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CHAMP_VIT_P_ddd.json
@@ -0,0 +1,115 @@
+{
+    "id": "bb1493f0bf53c582aef834154d88727d",
+    "name": "N_prefixTri_CHAMP_VIT_P_ddd",
+    "columns": [
+        {
+            "id": "0595184d876a2c4f76c8950dcb3b4cfc",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "060b9e89d489b4ebd48dbdead4ce393d",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        },
+        {
+            "id": "063678fff044da6c7fd1892403120902",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "3b3112847d110529f4d1a848110c698c",
+            "name": "ID_TRI",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "486430181786f13772080748578688d3",
+            "name": "ID_POINT",
+            "description": "COVADIS B1.2. - Identifiant de type 'PCV_[numero automatique] - Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "PCV_[0-9]+$"
+            }
+        },
+        {
+            "id": "69aac251173386216c8cd29d99f0fdea",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "8cf638a06843200e39f3203e6630372e",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "aaae4e8a82483fdec1ef2da6b93b3b2e",
+            "name": "VITESS_MAX",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "0.5",
+                    "1",
+                    "2",
+                    ""
+                ]
+            }
+        },
+        {
+            "id": "aae5b2dbf7f5c7098e47be5e621cda17",
+            "name": "VITESS_MIN",
+            "description": "Valeur vide interdite - Vitesse Min toujours inférieure à Vitesse Max",
+            "type": "Double",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "0.2",
+                    "0.5",
+                    "1",
+                    "2"
+                ]
+            }
+        },
+        {
+            "id": "e63c06adc1894b375553522cbafdadd6",
+            "name": "AZIMUTH",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CHAMP_VIT_P_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CHAMP_VIT_P_ddd.xml
deleted file mode 100644
index 462dc265..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_CHAMP_VIT_P_ddd.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[0d85a622bb8af68e03d13a6671f4e7a6]]></id>
-  <typeName><![CDATA[N_prefixTri_CHAMP_VIT_P_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0fe24aa13b5762d13e3588d5e45fae97]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[112c1d8b86bf00f9147857a8d21e04d4]]></id>
-      <name><![CDATA[VITESS_MIN]]></name>
-      <description><![CDATA[Valeur vide interdite - Vitesse Min toujours inférieure à Vitesse Max]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[0.2]]></value>
-        <value><![CDATA[0.5]]></value>
-        <value><![CDATA[1]]></value>
-        <value><![CDATA[2]]></value>
-      </listOfValues>
-      <constraint><![CDATA[VITESS_MAX IS NULL OR VITESS_MAX = '' OR ( VITESS_MIN <  VITESS_MAX )]]></constraint>
-    </attribute>
-    <attribute>
-      <id><![CDATA[364fb0bb9ad06926925968b73609f16c]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[56630d53c4011a99586bdf18d6de2684]]></id>
-      <name><![CDATA[VITESS_MAX]]></name>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[0.5]]></value>
-        <value><![CDATA[1]]></value>
-        <value><![CDATA[2]]></value>
-        <value><![CDATA[]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8ad0b2407079e74e7997bf15c3fd0748]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[PCV_[0-9]+$]]></regexp>
-      <id><![CDATA[9510415da0040d5e856ff493f5ff874b]]></id>
-      <name><![CDATA[ID_POINT]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type 'PCV_[numero automatique] - Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b83613d8fa4696865c237597e3e0e00a]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b9995d7cae179a8134a352e7a0a56da2]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d1968b84e2b37bdfc1e51d6b6eee9560]]></id>
-      <name><![CDATA[AZIMUTH]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e334dbd8c62e1723d2a03a844520411c]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COMMUNE_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COMMUNE_S_ddd.json
new file mode 100644
index 00000000..3666acf1
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COMMUNE_S_ddd.json
@@ -0,0 +1,124 @@
+{
+    "id": "05c3929fac32a948e13f52c92df22496",
+    "name": "N_prefixTri_COMMUNE_S_ddd",
+    "columns": [
+        {
+            "id": "4eb6f3c060c5d7922c614bfa4b4b8adc",
+            "name": "ANNEE_COG",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "7d3dad307ba7779c6f81b90910b041b3",
+            "name": "CODE_INSEE",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "pattern": "^[0-9][0-9AB][0-9]{3}$",
+                "maxLength": 5
+            }
+        },
+        {
+            "id": "a7bdf4ddaf3bed849093bdabd23aa16c",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "af5e52f07376e901252eb4b207dcf7aa",
+            "name": "HAB_SAISON",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d564f02da3f15c63560068d6b1f080af",
+            "name": "NOM_COM",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 80
+            }
+        },
+        {
+            "id": "d7ca959ba3ee559bbd60dfc355ff2010",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "d872e16c5ef763a0f2fb7b31a87c1e0d",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "df7a04c44bc696573bd61a1d00fdd7ad",
+            "name": "TX_HAB_SAI",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "e30c3cf18146e37358d443a964e27084",
+            "name": "HAB_PERM",
+            "description": "Valeur vide interdite",
+            "type": "Integer",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "e4dc0f06020bf7bfe46dfcf38816748b",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "e515cc976523bb8a1bfca0da60b826b0",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "f51a0a36b2e22a1d7235c5ffdcb7deb8",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COMMUNE_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COMMUNE_S_ddd.xml
deleted file mode 100644
index 18c4673e..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COMMUNE_S_ddd.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[1d339737c0c988d5878432617c89fa3f]]></id>
-  <typeName><![CDATA[N_prefixTri_COMMUNE_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0571639d3fa7ba18d4ccb3b3c2f5c20b]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[07be39a43802e39b33e4a1d88be1fc4f]]></id>
-      <name><![CDATA[ANNEE_COG]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[0c036bdd89abe5be380cb85837193fbc]]></id>
-      <name><![CDATA[NOM_COM]]></name>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[212faeb919f323e694841282d72d1470]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[27f01f771f6c328b18afd4d8d7aba316]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[60f7e5bb9d6e3d33b09ad0d1bb64ebe8]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6ce31bc977b4b0b929ed7589b06b8b88]]></id>
-      <name><![CDATA[HAB_SAISON]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[70e989e85d250a1ecb48049e30d06a9a]]></id>
-      <name><![CDATA[HAB_PERM]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8d2f9058fcec04a61679dcde637179bb]]></id>
-      <name><![CDATA[TX_HAB_SAI]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-      <constraint><![CDATA[TX_HAB_SAI >= 0 AND  TX_HAB_SAI <= 100]]></constraint>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d132cf855e0c3bd801c2ad84ddcee2ac]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[^[0-9]{5}$]]></regexp>
-      <id><![CDATA[d4629e066a4bebdc5249fde278cdad25]]></id>
-      <name><![CDATA[CODE_INSEE]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[f41f9b29b362f26061c75a539f9cd104]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COTE_VIT_DEB_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COTE_VIT_DEB_P_ddd.json
new file mode 100644
index 00000000..f42c3610
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COTE_VIT_DEB_P_ddd.json
@@ -0,0 +1,123 @@
+{
+    "id": "bb1152ec96d65076c8b5a5ee898d733a",
+    "name": "N_prefixTri_COTE_VIT_DEB_P_ddd",
+    "columns": [
+        {
+            "id": "1bdd78078d8cdd8a17ae93201485bad9",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "27fe9a1ee396afef7288769d9d51bf28",
+            "name": "DEBLIN",
+            "description": "Ne peut pas être négative",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "395cef1868375857a789c22b50ad8c2e",
+            "name": "VITESSE",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "3aee91bef9d4c944abc08bbcb558631a",
+            "name": "ID_POINT",
+            "description": "COVADIS B1.2. - Identifiant de type 'PRE_[numero automatique]'",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "PRE_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "426ccb7e5aa3988d7d6fc9d17fbf45fe",
+            "name": "COTE",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "6731a68d63a325149a347bf084a70d15",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "6bdc0b626787ee403a9f7ba40ca71d8e",
+            "name": "DATOBSERV",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "6d63fa1f54db2211d79475b0c958af59",
+            "name": "AZIMUTH",
+            "description": "Si la vitesse ou le débit linéique est renseigné, alors l’azimuth doit aussi être renseigné.",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "726269209e1297abe231c8254cc3d4b4",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "c13502ddfabad95d738d479bbad56b2c",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        },
+        {
+            "id": "c858b084e52c1da9b4fc97ff7c6e1b4d",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "dbcceb67972de405eca615efa5e33ab6",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COTE_VIT_DEB_P_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COTE_VIT_DEB_P_ddd.xml
deleted file mode 100644
index ca3e0083..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_COTE_VIT_DEB_P_ddd.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[26e271d62473a2db157a061848f247ca]]></id>
-  <typeName><![CDATA[N_prefixTri_COTE_VIT_DEB_P_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[00255fb0df7a23d32eff33d9238d82ca]]></id>
-      <name><![CDATA[VITESSE]]></name>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[19f4e57941013e9c0e474da4e8238f44]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3a9fcb5b8fd85f5c80a20046b2d0eb08]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur nulle interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3c78ea8f6eceee3e7ead619c4319cde6]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3f7e3e45f48213c565c0d4a22fe555ab]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[55130c6868ba86f85995279edd7c1bfc]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5fe18fd1dd4a3908bd5256e54d29dfc4]]></id>
-      <name><![CDATA[AZIMUTH]]></name>
-      <description><![CDATA[Si la vitesse ou le débit linéique est renseigné, alors l’azimuth doit aussi être renseigné.]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-      <constraint><![CDATA[("AZIMUTH" IS NOT NULL AND ( "VITESSE" IS NOT NULL OR "DEBLIN" IS NOT NULL ) ) OR ("AZIMUTH" IS NULL AND "VITESSE" IS NULL AND "DEBLIN" IS NULL)]]></constraint>
-    </attribute>
-    <attribute>
-      <id><![CDATA[658db7889ef62e58b7cc40cdc504d8f7]]></id>
-      <name><![CDATA[DEBLIN]]></name>
-      <description><![CDATA[Ne peut pas être négative]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-      <constraint><![CDATA[DEBLIN >= 0 OR DEBLIN IS NULL]]></constraint>
-    </attribute>
-    <attribute>
-      <id><![CDATA[950c8b21a8f4b03bb0d9952aaf634d77]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[PRE_[0-9]+$]]></regexp>
-      <id><![CDATA[c14bd9d5a7a1382e587306552d640b04]]></id>
-      <name><![CDATA[ID_POINT]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type 'PRE_[numero automatique]']]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e7f77aae432070a68389e2386718dec2]]></id>
-      <name><![CDATA[COTE]]></name>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e8413cb307722980722c91fa145dee6c]]></id>
-      <name><![CDATA[DATOBSERV]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ECOUL_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ECOUL_S_ddd.json
new file mode 100644
index 00000000..90f90647
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ECOUL_S_ddd.json
@@ -0,0 +1,91 @@
+{
+    "id": "6f63a412ee3ae88c4cb5cb69f7fcd945",
+    "name": "N_prefixTri_ECOUL_S_ddd",
+    "columns": [
+        {
+            "id": "197a691c7c83639c58cd3b395223bf0d",
+            "name": "VITESSE",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "Fai",
+                    "For",
+                    "Mod"
+                ]
+            }
+        },
+        {
+            "id": "3d456e6fab11b88a7b2396c3006867ed",
+            "name": "ID_ZONE",
+            "description": "COVADIS B1.2. - Identifiant de type ZE_[numero]",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "ZE_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "6a898baec11141ebf3a3b242abf08db4",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "799bede8fa0e54566191e3c08be51bff",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "7f8b1b7d9c143d40449bd045130ecab0",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        },
+        {
+            "id": "8d6b2f3bb6345a490430cd27c3d1df9d",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "a0366ce1e087059c7b206d7c96e7505e",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d9508edbba6c4968e7f8d7e86059e1ae",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ECOUL_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ECOUL_S_ddd.xml
deleted file mode 100644
index 4df5b04d..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ECOUL_S_ddd.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[33e20967e436cf542ca8d7a87917c4a0]]></id>
-  <typeName><![CDATA[N_prefixTri_ECOUL_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0dd2a15f808b258a03d731641a8fe2a2]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur nulle interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[2067c8f284a0882e053ec808ca16c2c8]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5b8926e7ccc01dfc563fb6a7435f24cb]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9edbb2031f5e49934196a69966de5f85]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[acc2a58597c25e28df6769f25fa38b1a]]></id>
-      <name><![CDATA[VITESSE]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[Fai]]></value>
-        <value><![CDATA[For]]></value>
-        <value><![CDATA[Mod]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b8030d026a7bce32dd805082a50af034]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ed528dbe22e5152b87e3f345dc675808]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[ZE_[0-9]+$]]></regexp>
-      <id><![CDATA[f5a90aaf88c4a0cba2c56ae22d65e5b7]]></id>
-      <name><![CDATA[ID_ZONE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type ZE_[numero]]]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_L_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_L_ddd.json
new file mode 100644
index 00000000..0e10c6c5
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_L_ddd.json
@@ -0,0 +1,106 @@
+{
+    "id": "e20359af951c292467fcb915e7c31c4b",
+    "name": "N_prefixTri_ENJEU_CRISE_L_ddd",
+    "columns": [
+        {
+            "id": "03e42c12fd371b23e9508a316caedb62",
+            "name": "CODCOVADIS",
+            "description": "Cf. nomenclature COVADIS standard PPRN (annexe D.1)",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "pattern": "^[0-9]{0,4}[a-z]*$",
+                "maxLength": 5
+            }
+        },
+        {
+            "id": "565c1e034edf1c989cdbd774e0d5c488",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "5d4bd771e534657f0c0c6f94f840d6a0",
+            "name": "WKT",
+            "type": "MultiLineString",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "606e9cf800bf5f422b3a99b6bfbc9945",
+            "name": "CATEGORIE",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "11",
+                    "99",
+                    "98",
+                    "01",
+                    "15",
+                    "07",
+                    "02",
+                    "10",
+                    "09",
+                    "06",
+                    "04",
+                    "03",
+                    "05",
+                    "12",
+                    "13",
+                    "14",
+                    "08"
+                ]
+            }
+        },
+        {
+            "id": "dd60970d7f938e8e6a440bba585965fc",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "e3f1aadb0e12394626083060871095c6",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "eac0a6cc86c6aacda1891fcacd8ea609",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "ecf1086d908e948ca3a906d40996a3be",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_L_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_L_ddd.xml
deleted file mode 100644
index f34c9bbf..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_L_ddd.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[cb87fe64ac2cae216cd05782c906c95b]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_CRISE_L_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <regexp><![CDATA[^[0-9]{0,4}[a-z]*$]]></regexp>
-      <id><![CDATA[130395ed37e114ea22e3efcac6f8cc75]]></id>
-      <name><![CDATA[CODCOVADIS]]></name>
-      <description><![CDATA[Cf. nomenclature COVADIS standard PPRN (annexe D.1)]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[2c5a49d030761804a57a0b559297cca3]]></id>
-      <name><![CDATA[CATEGORIE]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[99]]></value>
-        <value><![CDATA[98]]></value>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[12]]></value>
-        <value><![CDATA[13]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[08]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[514450b8785b6ec3e7fb1501bd1cd15f]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[972451a265037a715dc0ffbb6c0ff896]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cd2cb6913c57cfde8cef5681ad07107b]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d3545a3c232cca15a6bf7db74ef4669f]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ddae024ee4b13c5a944490b71614607e]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ec9d3987286cddb0913521293d235134]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_P_ddd.json
new file mode 100644
index 00000000..d874c919
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_P_ddd.json
@@ -0,0 +1,106 @@
+{
+    "id": "666aa8cb65a4234837fc8e52c961cd92",
+    "name": "N_prefixTri_ENJEU_CRISE_P_ddd",
+    "columns": [
+        {
+            "id": "09d6f19aef1618359beefcfde99ac66d",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "0d5e412a5ace71187b5083cae021732d",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "436f5a815ab404f5e706360f0c4c8a17",
+            "name": "CATEGORIE",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "11",
+                    "99",
+                    "98",
+                    "01",
+                    "15",
+                    "07",
+                    "02",
+                    "10",
+                    "09",
+                    "06",
+                    "04",
+                    "03",
+                    "05",
+                    "12",
+                    "13",
+                    "14",
+                    "08"
+                ]
+            }
+        },
+        {
+            "id": "45fcef0aea44aae925cc366e6056230c",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "8b67c06a69bf7d99717ef2efd0c9028e",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "b882ad0634446796282395e374c85d38",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "d4faa5daf55e9d5c7d71768b3a788799",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "ed92e0fdf9591bbd385352c8103d83c4",
+            "name": "CODCOVADIS",
+            "description": "Cf. nomenclature COVADIS standard PPRN (annexe D.1)",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "pattern": "^[0-9]{0,4}[a-z]*$",
+                "maxLength": 5
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_P_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_P_ddd.xml
deleted file mode 100644
index 80a326e5..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_CRISE_P_ddd.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[bb66a64d1455af01fb6c2e878fff9d32]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_CRISE_P_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <regexp><![CDATA[^[0-9]{0,4}[a-z]*$]]></regexp>
-      <id><![CDATA[0c8be8b33162e37dc7989aa8c17910ae]]></id>
-      <name><![CDATA[CODCOVADIS]]></name>
-      <description><![CDATA[Cf. nomenclature COVADIS standard PPRN (annexe D.1)]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4ae30caad92968c52483d8ee4192aa2f]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[65d51995083ecc06476134e24f8bbc89]]></id>
-      <name><![CDATA[CATEGORIE]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[99]]></value>
-        <value><![CDATA[98]]></value>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[12]]></value>
-        <value><![CDATA[13]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[08]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8a3eb6c577ad4c8e448f1c96ba279730]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b603f7ef2b967af89d0115dc0fd4472e]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[be7abe77ed4f3d0c7e0a8ec42820f40d]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[f5032337d2e72a3e587ac1962c73525b]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[fbc7d505fa1bb3b579767dbfa46c5924]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_DCE_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_DCE_S_ddd.json
new file mode 100644
index 00000000..fe25cf43
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_DCE_S_ddd.json
@@ -0,0 +1,59 @@
+{
+    "id": "2b6f49c3b2c66e4139db0191e253c776",
+    "name": "N_prefixTri_ENJEU_DCE_S_ddd",
+    "columns": [
+        {
+            "id": "01d169c91ee9f131d8f914fe4abe036b",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "311026ab95009c0938cd0555748521a7",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "4245f94f228ff8291431aae640f5c018",
+            "name": "PA_TYPE",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "",
+                    "BA",
+                    "A7",
+                    "HA",
+                    "BI"
+                ]
+            }
+        },
+        {
+            "id": "4992a4011ad2feba7172fd41c8cfdcd4",
+            "name": "EU_CD_PA",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "fea8807b56ca82cc038540a955afc63e",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_DCE_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_DCE_S_ddd.xml
deleted file mode 100644
index 5909b843..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_DCE_S_ddd.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[8eeb52323e07eadd0b0d1d1ea5484841]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_DCE_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[07f634f6bbce19450991766999a0b9ef]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[081197ce7b2dc8d4aa44f6f139c34ede]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[148e61971b6725a4240f81803568f415]]></id>
-      <name><![CDATA[PA_TYPE]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[]]></value>
-        <value><![CDATA[BA]]></value>
-        <value><![CDATA[A7]]></value>
-        <value><![CDATA[HA]]></value>
-        <value><![CDATA[BI]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[615e474e7d54387dbeb609f069d8d9b6]]></id>
-      <name><![CDATA[EU_CD_PA]]></name>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>true</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7ecfaaaef5c039b8e9b8e75c833b07d2]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_ECO_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_ECO_S_ddd.json
new file mode 100644
index 00000000..933f829f
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_ECO_S_ddd.json
@@ -0,0 +1,96 @@
+{
+    "id": "59b94cece0c04bb40df2d058ef69fbe6",
+    "name": "N_prefixTri_ENJEU_ECO_S_ddd",
+    "columns": [
+        {
+            "id": "2c05d1d52bd94fcb0db8e5b5da7815bd",
+            "name": "CODCOVADIS",
+            "description": "Cf. nomenclature COVADIS standard PPRN (annexe D.1)",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "pattern": "^[0-9]{4}[a-z]*$",
+                "maxLength": 5
+            }
+        },
+        {
+            "id": "5682b7d7d7e36c7c4c495b654ac3f80c",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "87bbdfca741e8cc29be1a8fae097a8f2",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "94d0e2f1f1b86ecfa47d4a85ef406b6d",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "9fbba2e4a1d2dea69d52fca82fff1c8b",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "cea9aac3b73716f5accb6b797699ff22",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d7fe9b179c7b7d2c5f8d74c6378a4017",
+            "name": "TYPE_ACTIV",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "03",
+                    "04",
+                    "99",
+                    "07",
+                    "02",
+                    "01",
+                    "06",
+                    "05"
+                ]
+            }
+        },
+        {
+            "id": "faa81b0de6a68a199eec3da5272ce808",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_ECO_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_ECO_S_ddd.xml
deleted file mode 100644
index d840f452..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_ECO_S_ddd.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[b02de7508cc2b4af4c9fe6a22ccfca41]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_ECO_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[03e36025c6fc5a01d0bd4d9a9169403c]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[43c07f3a86657e32e3814145454b39f5]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7fa0f2246ab0653c7af55401905f6e26]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[82f23905b944a195a875c9cc7e07d5ae]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ac48ad924536ddc3bea5f10a3019141e]]></id>
-      <name><![CDATA[TYPE_ACTIV]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[99]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[05]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[dcf1c62fc9c1eb441b1b5691df4991c1]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[^[0-9]{4}[a-z]*$]]></regexp>
-      <id><![CDATA[f0e3e39833709f36ea37f397f536fe2b]]></id>
-      <name><![CDATA[CODCOVADIS]]></name>
-      <description><![CDATA[Cf. nomenclature COVADIS standard PPRN (annexe D.1)]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ff545a0486fa774c25f1ad35e9aa50a7]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IED_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IED_P_ddd.json
new file mode 100644
index 00000000..dcfefed4
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IED_P_ddd.json
@@ -0,0 +1,62 @@
+{
+    "id": "de0eb8e1068a4a04d0fb341b3ecf12bd",
+    "name": "N_prefixTri_ENJEU_IED_P_ddd",
+    "columns": [
+        {
+            "id": "5edc5823bebb154b45c368c99a8bcbaa",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "69dcea6a749429a71e1a2262999703f7",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "72667ab07497b527fdc32ebc1f9f251e",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "8692dbf58821b17f85bca42c773137b8",
+            "name": "NOM",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 100
+            }
+        },
+        {
+            "id": "aeacf3ecc0407459b737ea24cfaa8714",
+            "name": "CODE_IED",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d6b3de2e5d35d6999e9d4d3574a096a1",
+            "name": "CODE_ACTIV",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 6
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IPPC_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IPPC_P_ddd.json
new file mode 100644
index 00000000..40053794
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IPPC_P_ddd.json
@@ -0,0 +1,63 @@
+{
+    "id": "5f5edc2568a4beb2cb4200c80e2d9fff",
+    "name": "N_prefixTri_ENJEU_IPPC_P_ddd",
+    "columns": [
+        {
+            "id": "0ca7740f00084c75cffd1396468ad361",
+            "name": "NOM",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "46c230381b08c1a54fc01f2b08fdf64d",
+            "name": "CODE_IPPC",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "7110007b8eaca23002fd009fd4dab994",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "818c9b7f3b11d615d7ce9e4d8fd279ac",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "95708b2239eb010d9f7a10faab1830a5",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "df568ab29d380849c5ea03997831c02a",
+            "name": "CODE_ACTIV",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 6
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IPPC_P_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IPPC_P_ddd.xml
deleted file mode 100644
index d599cbb4..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_IPPC_P_ddd.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[042d11ff521181b8f8d4b4d3961975f3]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_IPPC_P_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[17201571032cfc375e697a32254e61ef]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[53011e146daedda79a54201523b6b55f]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5bb11aa9a8f50f9a5224cff75f9ff68a]]></id>
-      <name><![CDATA[CODE_ACTIV]]></name>
-      <type><![CDATA[String]]></type>
-      <size>6</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[861640f6163ec803cdc7dffe2652d02f]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d62cc0b9e9e12fdd2c5fa4bf09fd7bb8]]></id>
-      <name><![CDATA[NOM]]></name>
-      <type><![CDATA[String]]></type>
-      <size>100</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d8593d6add0dc0e11fba1ed00e790a71]]></id>
-      <name><![CDATA[CODE_IPPC]]></name>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>true</nullable>
-      <identifier>true</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_P_ddd.json
new file mode 100644
index 00000000..b0a3399d
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_P_ddd.json
@@ -0,0 +1,75 @@
+{
+    "id": "753e61c837050dc32bdac88721341556",
+    "name": "N_prefixTri_ENJEU_PATRIM_P_ddd",
+    "columns": [
+        {
+            "id": "289af181078f7f2dc2d4efeeb009a8fd",
+            "name": "TYPE_ENJEU",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 80
+            }
+        },
+        {
+            "id": "39cd57f4e6caaba0ea413af82a2ec122",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "9e0762ef88044c9dd4c379cbdb7d7895",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "b7801c80a3fec01e09e0e5d781547ebe",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "dbbec236804372b00793325ded419625",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "e364b47bd88853a58e15979c459cd6c1",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "f2e292201ac4be3ad1af47980578e820",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_P_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_P_ddd.xml
deleted file mode 100644
index b3f4887d..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_P_ddd.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[91becf9357e0c46906034f49edfe4089]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_PATRIM_P_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[302c6d1df8621b99d95b4958ecd2decc]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3fd7fc6cd40dc7a319ce47685f1593e6]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4c427ddc952db4040ba43bba8217b954]]></id>
-      <name><![CDATA[TYPE_ENJEU]]></name>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5d3a6645930a1c80f5abdfc3514f4ec5]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[77b853cc0fa910b6ffe7a7758b271b99]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[850fa64cdc6955bd48cc4db5441a7eac]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9f67fd8caa1040e0f8905ede1f8e4897]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_S_ddd.json
new file mode 100644
index 00000000..4abcd07b
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_S_ddd.json
@@ -0,0 +1,75 @@
+{
+    "id": "9e4bee114f56a1b2fdae72102d8048be",
+    "name": "N_prefixTri_ENJEU_PATRIM_S_ddd",
+    "columns": [
+        {
+            "id": "301a1c5718b6de1095b5ed7e495ca7f4",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "3fc5cb37d8599fd6e99c307735969110",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "741c41b1cfd973eda592123f079a1384",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "85439537d734f7f04c5d24841e892c9e",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "9721200a121cb27d5527816492f26d33",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "9b017e380c6b65771cd93c0617df1b03",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "ab4dfd81d48c28f3f5804009f59d6c75",
+            "name": "TYPE_ENJEU",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 80
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_S_ddd.xml
deleted file mode 100644
index 6d096a27..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_PATRIM_S_ddd.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[db4365de605fac417436b9aa81d6d64c]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_PATRIM_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[03bf439a6bc74a9cd89ad1c591e246ef]]></id>
-      <name><![CDATA[TYPE_ENJEU]]></name>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[20ff8f64be5cb7cd3abd8984586256d5]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[332805710b9a19c64d63bf5b38f8b701]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[397c3c76090aa71e22f967394670ae31]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[569e8fbb2f061dde80b69994deef14bf]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cf3fb4d4734daa86177111e72e53fdd1]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e27ecf6fb1b1c79be8dc070eb494a1c3]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_RAPPORT_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_RAPPORT_ddd.json
new file mode 100644
index 00000000..f29a1a2a
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_RAPPORT_ddd.json
@@ -0,0 +1,124 @@
+{
+    "id": "dea41a913caf04312f9f6f9ff904b938",
+    "name": "N_prefixTri_ENJEU_RAPPORT_ddd",
+    "columns": [
+        {
+            "id": "09d6541d72b4c9bd232543afd72a5ede",
+            "name": "TYP_INOND2",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "2062def188ee18d6318c628346616e7b",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "2e25dea4154dac636706d4ea2061ec36",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "3db34d321220a6ce7e22f33dec23eec6",
+            "name": "ID",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "5032b6e1efae76ad34677d881e7d354a",
+            "name": "SCENARIO",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "83a0ec620dfcaec60e5df7085a3ba5cb",
+            "name": "EMPLOI_MAX",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "872e08fe5d06c965e7e225f64a3abd3c",
+            "name": "HAB_PERM",
+            "description": "Valeur vide interdite",
+            "type": "Integer",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "889cf5c7ca23e82eb2674e0ec07eca02",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "8c469b2910622c9545a45d46537e78dd",
+            "name": "EMPLOI_MIN",
+            "description": "Valeur vide interdite",
+            "type": "Integer",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "bf9aafab0edde36b357b1cce6d3ccc56",
+            "name": "TYP_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_RAPPORT_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_RAPPORT_ddd.xml
deleted file mode 100644
index 1cb6d558..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_RAPPORT_ddd.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[a8af294ee4d4be5c8e756c73b8963648]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_RAPPORT_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[09cf433aa326ae61ff8ad5295aff7275]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[0d1799db9622c590df31fbc3852c06d7]]></id>
-      <name><![CDATA[EMPLOI_MIN]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[0e47268686026f2a7d3966649ea3b19f]]></id>
-      <name><![CDATA[HAB_PERM]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[1b2f4917523292c4343af629c9191475]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[20de06021eee377ef084a2b61bed23af]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[83a363ebb7d90a9997c1ce333d3d6251]]></id>
-      <name><![CDATA[EMPLOI_MAX]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[844df6be4a462d47f433a685d987942f]]></id>
-      <name><![CDATA[TYP_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e9a10066cb430617d28e8418e6a094b1]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[fb9eefb1d505ec751ba3d36aee7f60bb]]></id>
-      <name><![CDATA[ID]]></name>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>false</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_STEU_P_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_STEU_P_ddd.json
new file mode 100644
index 00000000..c81d8f1c
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_STEU_P_ddd.json
@@ -0,0 +1,52 @@
+{
+    "id": "6a9129c92808cc4d1cd6a2cd920e991d",
+    "name": "N_prefixTri_ENJEU_STEU_P_ddd",
+    "columns": [
+        {
+            "id": "24544b05fc0288369125a5e69bced5f4",
+            "name": "CAPACITE_N",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "3892d8675fc2df43c638c2a386ed61ad",
+            "name": "CODE_STEU",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "55a8e21f313689cc3019bfcf73eea27f",
+            "name": "DATIMPORT",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "967891e1a85e966cda64a7b79cf7d10c",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d3d6ba309455788cce4ccef7f4cb8836",
+            "name": "WKT",
+            "type": "MultiPoint",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_STEU_P_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_STEU_P_ddd.xml
deleted file mode 100644
index 56000da9..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ENJEU_STEU_P_ddd.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[e502311aa7e29e608e45785913a03db8]]></id>
-  <typeName><![CDATA[N_prefixTri_ENJEU_STEU_P_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[5ea076eab7075fa9aacf9886bfcb6e9f]]></id>
-      <name><![CDATA[CAPACITE_N]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[65078ff8e38e02cc71071271bf363c6e]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[95a6da80f2ee07cd5614990f6e0ce761]]></id>
-      <name><![CDATA[DATIMPORT]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[aecb38daf24cf74a3abb29bf932b6dc2]]></id>
-      <name><![CDATA[CODE_STEU]]></name>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>true</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[aee279fa6c1f4b14fa9bc89af63a3c30]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_INONDABLE_suffixInond_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_INONDABLE_suffixInond_S_ddd.json
new file mode 100644
index 00000000..6b439308
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_INONDABLE_suffixInond_S_ddd.json
@@ -0,0 +1,125 @@
+{
+    "id": "1a9c7d96761590a44882360ceeb2be42",
+    "name": "N_prefixTri_INONDABLE_suffixInond_S_ddd",
+    "columns": [
+        {
+            "id": "36fc952cfcfc21bb8e504dfdbe72a8d9",
+            "name": "COURS_DEAU",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 127
+            }
+        },
+        {
+            "id": "4d159b42648bdff9dbcc2bcfa5f27edc",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "50fd9ade445819d4d28c122c4e326296",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "5a7f27cd15036b49ed295b762eb8bb27",
+            "name": "SCENARIO",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "6275fb734cb8bc1d1ed4f9e430481014",
+            "name": "TYP_INOND2",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "7de1979381388196d7bcc8329898255a",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "85ea88d4b9374ce9330e1d4ccbe68814",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "88eab770fd22ab89ffc9f19b0c3d37e7",
+            "name": "ID_TRI",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "d6d207d07e5daef7fa996af118ed7c82",
+            "name": "TYP_INOND",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "ea2ae1b87bbe2b1f1fc71a2d22a4d4cc",
+            "name": "ID_S_INOND",
+            "description": "COVADIS B1.2. - Identifiant de type SIN_[numero]",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "SIN_[0-9]+$",
+                "maxLength": 30
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_INONDABLE_suffixInond_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_INONDABLE_suffixInond_S_ddd.xml
deleted file mode 100644
index 7ef86f2d..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_INONDABLE_suffixInond_S_ddd.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[d9f9e8b21380bc22e7eaa5b8b0864f53]]></id>
-  <typeName><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[02279fb4e20be825d7af25b606010284]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[0f6930d7a2d0d51e55e5c01ef35ba187]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[04Faicc_ct]]></value>
-        <value><![CDATA[01Forcc_ct]]></value>
-        <value><![CDATA[01Forcc_100]]></value>
-        <value><![CDATA[03Mcc_ct]]></value>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4c8159477af195298f319103b61768e5]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[586d405dc7055b70ffda8521ed3ab374]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[692b36d905a8cc62c42baf0dd085a6a2]]></id>
-      <name><![CDATA[TYP_INOND]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[713d031e0fd7f8e0bb34a76e4db4dffc]]></id>
-      <name><![CDATA[COURS_DEAU]]></name>
-      <type><![CDATA[String]]></type>
-      <size>127</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9379c20512051eb14eac787a7f415bc3]]></id>
-      <name><![CDATA[TYP_INOND2]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c543b98126e2221a52518b2e17647316]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ce84c0588f50c00f022f9ece21b2918b]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[SIN_[0-9]+$]]></regexp>
-      <id><![CDATA[d9478ca1ed4fa4ae2d26fb9dfbd69f1a]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type SIN_[numero]]]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_COTE_L_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_COTE_L_ddd.json
new file mode 100644
index 00000000..28abfcd0
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_COTE_L_ddd.json
@@ -0,0 +1,148 @@
+{
+    "id": "3d4e469c6eddc1dc8f8f2fff62bd0875",
+    "name": "N_prefixTri_ISO_COTE_L_ddd",
+    "columns": [
+        {
+            "id": "4b058a7da64637355eee06ad1fdd8df5",
+            "name": "TYP_INOND2",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "4f23f60de39305a09834a4c5b5cf5ea8",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "5266517a49def5d75034516143178ee7",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "624b29b074cce14480e4cf11fc62d344",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "7b7fb438055638b2605987f3a23686e5",
+            "name": "COTE",
+            "description": "Valeur vide interdite",
+            "type": "Double",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "8ccb4c23b5d92de3fd50ddb5ffd63871",
+            "name": "TYP_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "ad81018d87b74c0d940cc98fd25918c6",
+            "name": "SCENARIO",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "c7a99d4503a997919d5ab7a0bd7193e9",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "d2e8cfe0b7150e5bcda821220c89df76",
+            "name": "ID_LIGNE",
+            "description": "COVADIS B1.2. - Identifiant de type 'LIC_[numero]'",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "LIC_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "e432d04296de787a5a998b15dd1bb7be",
+            "name": "COURS_DEAU",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 127
+            }
+        },
+        {
+            "id": "e755f4e8bf3a6cba024bd6c29bd8b099",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        },
+        {
+            "id": "e9907cc8340d8e5f6ea8098934abb8ea",
+            "name": "WKT",
+            "type": "MultiLineString",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_COTE_L_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_COTE_L_ddd.xml
deleted file mode 100644
index 408c918a..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_COTE_L_ddd.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[a9081a44d2955a1bf0b830655962c943]]></id>
-  <typeName><![CDATA[N_prefixTri_ISO_COTE_L_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[018b6d174b297a5ac1db9dd441e54dab]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[LIC_[0-9]+$]]></regexp>
-      <id><![CDATA[3d4984924f49d502745dc6d08f3bdf99]]></id>
-      <name><![CDATA[ID_LIGNE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type 'LIC_[numero]']]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3d92c30f83ab66df95ed89f546866121]]></id>
-      <name><![CDATA[COURS_DEAU]]></name>
-      <type><![CDATA[String]]></type>
-      <size>127</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[543c8f18bc30bdf70c4a0ee88986c898]]></id>
-      <name><![CDATA[COTE]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[62b01ba4d7c11adf54ef65c43a8a6cd7]]></id>
-      <name><![CDATA[TYP_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[685cb6f50e113b4ffcd67d290d484da6]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6f11a9b838030a10f781fae76933ac81]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ae61000946ab098d08c705d5a803f887]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur nulle interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b356737e85d2abea1511e2f46624b059]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c06a6af88815b2da91157294da111f90]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[04Faicc_ct]]></value>
-        <value><![CDATA[01Forcc_ct]]></value>
-        <value><![CDATA[01Forcc_100]]></value>
-        <value><![CDATA[03Mcc_ct]]></value>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cec3420029a89af8d2f0a0119f0aa000]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_DEB_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_DEB_S_ddd.json
new file mode 100644
index 00000000..1e3f8d74
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_DEB_S_ddd.json
@@ -0,0 +1,96 @@
+{
+    "id": "a31b326475cf78a5e2dd5e7ae4991bb5",
+    "name": "N_prefixTri_ISO_DEB_S_ddd",
+    "columns": [
+        {
+            "id": "03444c47ba08c8f475843b1163f2f68f",
+            "name": "ID_ZONE",
+            "description": "COVADIS B1.2. - Identifiant de type ZCD_'[numero]'",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "ZCD_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "15da1d618efc1fe5d54c7ad187da71e7",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        },
+        {
+            "id": "722358cd6f36568f7af54e7e8bbd686d",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "7ec5ac927939180dd96b0241ff5fb66d",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "bc878ea685a2435dd2cd23c03ea1e566",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "cf08e78cbe0b481d5ed0b5e3378a4776",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "e170ba1da615534fd0dabebb1db948e9",
+            "name": "ID_TRI",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "e500f80cdf2448e1750ae219c8ce1d03",
+            "name": "DEBLIN_MIN",
+            "description": "Valeur vide interdite- Exprimé en m²/s - Ne peut pas être négative",
+            "type": "Double",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "ffd6ccba3faf1f17fe481fa3aa8f98ef",
+            "name": "DEBLIN_MAX",
+            "description": "Exprimé en m²/s - DEBLIN_MAX >= DEBLIN_MIN",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_DEB_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_DEB_S_ddd.xml
deleted file mode 100644
index 8be55d06..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_DEB_S_ddd.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[02a920fa0b8350c5fb6e4f99913eb07d]]></id>
-  <typeName><![CDATA[N_prefixTri_ISO_DEB_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <regexp><![CDATA[ZCD_[0-9]+$]]></regexp>
-      <id><![CDATA[2b8efaa022a54209168ee125ce084f34]]></id>
-      <name><![CDATA[ID_ZONE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type ZCD_'[numero]']]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4407bd14a5890c529cb7ba63fdca7d43]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4582ec97138c1097cf787a5054f8316e]]></id>
-      <name><![CDATA[DEBLIN_MIN]]></name>
-      <description><![CDATA[Valeur vide interdite- Exprimé en m²/s- Ne peut pas être négative]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>false</nullable>
-      <constraint><![CDATA[DEBLIN_MIN >= 0]]></constraint>
-    </attribute>
-    <attribute>
-      <id><![CDATA[462869d774d4c90dbd999760cc56cf95]]></id>
-      <name><![CDATA[DEBLIN_MAX]]></name>
-      <description><![CDATA[Exprimé en m²/s - DEBLIN_MAX >= DEBLIN_MIN]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-      <constraint><![CDATA[ DEBLIN_MAX= NULL  OR   DEBLIN_MAX >=  DEBLIN_MIN]]></constraint>
-    </attribute>
-    <attribute>
-      <id><![CDATA[656c50aaf6355d45dde0f49ffcb67d91]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6b28ce22a10fcf990ad337e2ad4852d4]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA['T']]></value>
-        <value><![CDATA['F']]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6f16128945ae4b8a03f4166ad5fb87a6]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ac485e0fd91c08bcc5ef1c576b03aa15]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[f6d4108c07364845774d43529b19ee11]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.json
new file mode 100644
index 00000000..cbb116ea
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.json
@@ -0,0 +1,174 @@
+{
+    "id": "872b653303e627041c50b2bca0e83757",
+    "name": "N_prefixTri_ISO_HT_suffixIsoHt_S_ddd",
+    "columns": [
+        {
+            "id": "44b7394c61ca6fa7b001c43722acbde6",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "53a8b31af9c5d596ea674a71bc903c32",
+            "name": "SCENARIO",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "5ae13050f35f80d17187117ffa355778",
+            "name": "HT_MAX",
+            "description": "Si cette valeur n’est pas renseignée, la plage de hauteur correspond à la plage des hauteurs maximales (supérieure à une hauteur donnée). Par exemple, la plage des « hauteurs supérieures ou égales à 4 m» sera modélisée dans la base par le remplissage du seuil inférieur de la plage de hauteur (avec dans le cas de l’exemple la valeur « 4 ») et un seuil supérieur laissé vide c’est à dire 9999 pour Mapinfo et NULL pour Qgis.",
+            "type": "Double",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "0.5",
+                    "1",
+                    "1.5",
+                    "2",
+                    "3",
+                    "4",
+                    ""
+                ]
+            }
+        },
+        {
+            "id": "701862ec2ae6bed28b2a3e0a55e8fee9",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "8993748cd627de9058ae8e9a3201ed33",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        },
+        {
+            "id": "8e3b632ceb2ddf9ac4331ecb2c59ac54",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "bdfd92ccc82f84cd0c1fae039235e4d7",
+            "name": "TYP_INOND2",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "c46c48ecb339be31cb04f157123b7337",
+            "name": "COURS_DEAU",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 127
+            }
+        },
+        {
+            "id": "c5e8ca685b183606905fb53eecd9d96c",
+            "name": "TYP_INOND",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "c848d56350993556f092dbf37006cdfb",
+            "name": "ID_TRI",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "cb1ff310f3d6ac8d03458ac58db02df4",
+            "name": "ID_ZONE",
+            "description": "COVADIS B1.2. - Identifiant de type 'ZCH_[numero]'",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "ZCH_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "dd71706bd5f384b00c31a185b5d09d5c",
+            "name": "HT_MIN",
+            "description": "Valeur vide interdite",
+            "type": "Double",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "0",
+                    "0.5",
+                    "1",
+                    "1.5",
+                    "2",
+                    "3",
+                    "4"
+                ]
+            }
+        },
+        {
+            "id": "fa120eeea2e0a5018c87efee2f8767c2",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.xml
deleted file mode 100644
index 5cf0417f..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ISO_HT_suffixIsoHt_S_ddd.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[10010a09af5c9322a47dbec895539f0d]]></id>
-  <typeName><![CDATA[N_prefixTri_ISO_HT_suffixIsoHt_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0924f5cfda1e78138cfc7843f483d86e]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[1927e614448a8750d51646732346b053]]></id>
-      <name><![CDATA[HT_MIN]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[0]]></value>
-        <value><![CDATA[0.5]]></value>
-        <value><![CDATA[1]]></value>
-        <value><![CDATA[2]]></value>
-        <value><![CDATA[3]]></value>
-        <value><![CDATA[4]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3298578e34f593bc2e5f63b49d22abfc]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[45a65c2abbc6371f0457f950d5fcd023]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[597045f908dd5f45ff9fd8cfab13e5b1]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[85f736867f7bb9ca7af880880f30307b]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9e4c1b9a949c5c3d4c531a51fe296767]]></id>
-      <name><![CDATA[COURS_DEAU]]></name>
-      <type><![CDATA[String]]></type>
-      <size>127</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a51bdbadf8381b1ec71839db1a317227]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a92e7ee2120aa440f834d8452ee6b144]]></id>
-      <name><![CDATA[TYP_INOND2]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c6296c55aaa18401d5d3502de62167c9]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[04Faicc_ct]]></value>
-        <value><![CDATA[01Forcc_ct]]></value>
-        <value><![CDATA[01Forcc_100]]></value>
-        <value><![CDATA[03Mcc_ct]]></value>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d1cce2c7a3c62a2bad6d0b0dd409df0a]]></id>
-      <name><![CDATA[HT_MAX]]></name>
-      <description><![CDATA[Si cette valeur n’est pas renseignée, la plage de hauteur correspond à la plage des hauteurs maximales (supérieure à une hauteur donnée). Par exemple, la plage des « hauteurs supérieures ou égales à 4 m» sera modélisée dans la base par le remplissage du seuil inférieur de la plage de hauteur (avec dans le cas de l’exemple la valeur « 4 ») et un seuil supérieur laissé vide c’est à dire 9999 pour Mapinfo et NULL pour Qgis.]]></description>
-      <type><![CDATA[Double]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[0.5]]></value>
-        <value><![CDATA[1]]></value>
-        <value><![CDATA[2]]></value>
-        <value><![CDATA[3]]></value>
-        <value><![CDATA[4]]></value>
-        <value><![CDATA[]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d957587aea94883389bdcedb04d3f83d]]></id>
-      <name><![CDATA[TYP_INOND]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[ZCH_[0-9]+$]]></regexp>
-      <id><![CDATA[d97302712cd0eaf97db5a3c31d4a218c]]></id>
-      <name><![CDATA[ID_ZONE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type 'ZCH_[numero]']]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_OUV_PROTEC_L_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_OUV_PROTEC_L_ddd.json
new file mode 100644
index 00000000..ecbdd39c
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_OUV_PROTEC_L_ddd.json
@@ -0,0 +1,144 @@
+{
+    "id": "4dda5554688cd6f3f7579638a1570771",
+    "name": "N_prefixTri_OUV_PROTEC_L_ddd",
+    "columns": [
+        {
+            "id": "07321d95136f774894bc1645ffeda3f5",
+            "name": "TYP_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "0ee636a129ab195a4780eb287df1dc24",
+            "name": "ID_OUVRAGE",
+            "description": "COVADIS B1.2. - Identifiant de type SIN_[numero]",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "OUV_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "23620fac1042a526ab6d8b5e37e11ff5",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "4b8a765262702e2837c3dadf1ad55680",
+            "name": "TYP_INOND2",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "04",
+                    "02",
+                    "03"
+                ]
+            }
+        },
+        {
+            "id": "568be2907666861ffbda32089970047d",
+            "name": "NOM",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 254
+            }
+        },
+        {
+            "id": "8185331974620cb98553a0017b51ff00",
+            "name": "WKT",
+            "type": "MultiLineString",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "976b6cfc6de53435c96d62cd66caa51b",
+            "name": "SCENA_RUPT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "01",
+                    "05",
+                    "02",
+                    "04",
+                    "03",
+                    "99"
+                ]
+            }
+        },
+        {
+            "id": "a5429c5444e56f4fd801c413edaf165b",
+            "name": "ID_SIOUH",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "c0c65b4dcc355fb65c3a6bfbd9b9c234",
+            "name": "ID_ROE",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "d7efad4de63e3f1f39cf89927057aeba",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "da03d5ec4ea4de451efc45d3af728c5d",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "fc5bed581a74af7ece46bdb3b812d1dd",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_OUV_PROTEC_L_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_OUV_PROTEC_L_ddd.xml
deleted file mode 100644
index b4bee2cf..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_OUV_PROTEC_L_ddd.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[7945dc1b14df5e1c62f24194da6cb86f]]></id>
-  <typeName><![CDATA[N_prefixTri_OUV_PROTEC_L_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[1f39031bebf45d3826626bda7bcdd4c1]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[259206ae2e50a2f4972df01d7fb99a07]]></id>
-      <name><![CDATA[SCENA_RUPT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3567b5fe82f654e4099e04eeb15fcf9b]]></id>
-      <name><![CDATA[NOM]]></name>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[43f4692c9336c19dee7192d1698b390d]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a7339257f3563efcbcf95ca8fa81b673]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b43984569c8f7514eee9d70bd7ede147]]></id>
-      <name><![CDATA[ID_ROE]]></name>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ba82a9e05b5e7a667de533102a33723a]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur nulle interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[OUV_[0-9]+$]]></regexp>
-      <id><![CDATA[c2ef12fed26e83464f90ac5752e163a1]]></id>
-      <name><![CDATA[ID_OUVRAGE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type SIN_[numero]]]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d060b1bba72e2398464723189276817d]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e1ffa2ae8aa97487f980404b58855153]]></id>
-      <name><![CDATA[ID_SIOUH]]></name>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[eaf753b8046560355f4daff8f35505cf]]></id>
-      <name><![CDATA[TYP_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_QUARTIER_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_QUARTIER_S_ddd.json
new file mode 100644
index 00000000..ed0dbd89
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_QUARTIER_S_ddd.json
@@ -0,0 +1,84 @@
+{
+    "id": "9c7af389c9367e37ff3c26ed6db9ffb7",
+    "name": "N_prefixTri_QUARTIER_S_ddd",
+    "columns": [
+        {
+            "id": "0da1797ba9e6c0a971032efb5fb9a2b1",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "27d5b59c7a95509a10e08420484ead66",
+            "name": "CODE_INSEE",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 5
+            }
+        },
+        {
+            "id": "3183995fbd732558df88b59ccd4b2303",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "333e0abb65064891f4df1a5cba964e8a",
+            "name": "HAB_PERM",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "38a252c0f751ab088a9ba57725aa34f1",
+            "name": "ID_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "78e402159cae4ad8263cbb0713ca6fc0",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "e45567e7ddedd1969ba80cdd45aacf02",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "ff90f53f22fde65cebfa8839467a9837",
+            "name": "NOM_SI_EXT",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 50
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_QUARTIER_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_QUARTIER_S_ddd.xml
deleted file mode 100644
index 2225873a..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_QUARTIER_S_ddd.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[f7b498735f0efac1bc8e0adaaf78bb90]]></id>
-  <typeName><![CDATA[N_prefixTri_QUARTIER_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[15b5ae5e1d3164daae178aaf38ee7fcd]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[1c1f13a78c451c1ce129b97cff05e2f5]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[459bee55545eaf90b4a7c06eb8fa9ef6]]></id>
-      <name><![CDATA[CODE_INSEE]]></name>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9e67a414a86137def2718c75129e0f3d]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a5de58608133fa2e314b273d4f317f84]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[af73b15c8435ccbfa2b40976dc598ae6]]></id>
-      <name><![CDATA[NOM_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ca060db040486b91183085e372d883af]]></id>
-      <name><![CDATA[ID_SI_EXT]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e08acb2a5e765b50f0f600f057c8be84]]></id>
-      <name><![CDATA[HAB_PERM]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_REL_HYDRO_INOND_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_REL_HYDRO_INOND_ddd.json
new file mode 100644
index 00000000..e9e00e24
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_REL_HYDRO_INOND_ddd.json
@@ -0,0 +1,47 @@
+{
+    "id": "248d4f5b981afb499f831c4146b4ae8a",
+    "name": "N_prefixTri_REL_HYDRO_INOND_ddd",
+    "columns": [
+        {
+            "id": "0420d09827f0e09e2ad2d018b1238581",
+            "name": "CODE_EH",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false,
+                "maxLength": 10
+            }
+        },
+        {
+            "id": "0df6a886ddc7082c8879a49533358f66",
+            "name": "ID_TRI",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "23aca607382a6f31171885785934c31b",
+            "name": "VER_SI_EXT",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "b034760eaeae2df99b2412726cde7efe",
+            "name": "ID_S_INOND",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_REL_HYDRO_INOND_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_REL_HYDRO_INOND_ddd.xml
deleted file mode 100644
index 4ffcd28d..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_REL_HYDRO_INOND_ddd.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[b71e80e602886147027edb07eb20ef00]]></id>
-  <typeName><![CDATA[N_prefixTri_REL_HYDRO_INOND_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[574598dfe926f8b63133579d3013870c]]></id>
-      <name><![CDATA[CODE_EH]]></name>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[63e73bfebf4999fda5d90f33507eecb3]]></id>
-      <name><![CDATA[VER_SI_EXT]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[70886dc487d43ba1f95d00deb91c6fdd]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c30792a28fce2b69a003b77b4e117d00]]></id>
-      <name><![CDATA[ID_S_INOND]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_INONDABLE_suffixInond_S_ddd.ID_S_INOND]]></reference>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SOUST_INOND_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SOUST_INOND_S_ddd.json
new file mode 100644
index 00000000..a7eca1b1
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SOUST_INOND_S_ddd.json
@@ -0,0 +1,83 @@
+{
+    "id": "19029ec8b2f9eaabc179938237f3b607",
+    "name": "N_prefixTri_SOUST_INOND_S_ddd",
+    "columns": [
+        {
+            "id": "0ce6fcb39fd852465b2f12129384b335",
+            "name": "ID_ZONE",
+            "type": "String",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "0f06d05836ae8b2f93e21011802d65aa",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "1c460be5b298f4471f335e9adffe390f",
+            "name": "SCENARIO",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "2f8ce8a147b5aef38d68128062b75e03",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "c49b141f4d877efd9b1c5081a18fd208",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "d92eceed5def551e92940244275515ce",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d951c9d7cd98ee82a02df1bd2534216c",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SOUST_INOND_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SOUST_INOND_S_ddd.xml
deleted file mode 100644
index 23ca9fb0..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SOUST_INOND_S_ddd.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[9c8ec99a34b1a31c4092816b6fe5c733]]></id>
-  <typeName><![CDATA[N_prefixTri_SOUST_INOND_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <regexp><![CDATA[ZSI_[0-9]+$]]></regexp>
-      <id><![CDATA[4f7bbd9798d3ff4c2cafa1f2e2ef7cfe]]></id>
-      <name><![CDATA[ID_ZONE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type ZSI_[numero]]]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[58565214cbea5e632c0a96570a4523fd]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5df7c191abadaaf4a7f3c37e10f11490]]></id>
-      <name><![CDATA[ID_ROE]]></name>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[82db98757c50605ecadcd6b7581924ec]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur nulle interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9581ea38e3036d731f35dacc7905dad8]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[969d95d1b0be22170f7ef2f87f67280f]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[bb4d2301f465b9300358415ebbf7ae1f]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[fa9091ff148437887fb5ecd4d049eb06]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[04Faicc_ct]]></value>
-        <value><![CDATA[01Forcc_ct]]></value>
-        <value><![CDATA[01Forcc_100]]></value>
-        <value><![CDATA[03Mcc_ct]]></value>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SURALEA_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SURALEA_S_ddd.json
new file mode 100644
index 00000000..9becd7dc
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SURALEA_S_ddd.json
@@ -0,0 +1,86 @@
+{
+    "id": "643ed5073eca983b9fc71ec51339cfef",
+    "name": "N_prefixTri_SURALEA_S_ddd",
+    "columns": [
+        {
+            "id": "5c1dfc12218a47860cc0cf5076c97275",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "5e6a84378464f9258f9458c09e88641f",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "711729915b4cac0a4893d61ecb070872",
+            "name": "SCENARIO",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "868e2172aec1752afe89f0742fc78125",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "9269d360bab683392aa088e437c3025f",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "b79e071259123c8123e3e8ba871e2305",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "e470007c6e89061a7217968fe50ddef7",
+            "name": "ID_ZONE",
+            "description": "COVADIS B1.2. - Identifiant de type ZSA_[numero]",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "ZSA_[0-9]+$",
+                "maxLength": 30
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SURALEA_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SURALEA_S_ddd.xml
deleted file mode 100644
index a96774af..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_SURALEA_S_ddd.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[d0c6e5b57fcd339c33eb9d6c902c51e7]]></id>
-  <typeName><![CDATA[N_prefixTri_SURALEA_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0b19672e2f029b24b377e2d44f7fc8f0]]></id>
-      <name><![CDATA[EST_REF]]></name>
-      <type><![CDATA[String]]></type>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[1425f2ed02e8e2860d31808756b68cda]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[ZSA_[0-9]+$]]></regexp>
-      <id><![CDATA[360b71cf0c1cc5958a0166144d2c77a4]]></id>
-      <name><![CDATA[ID_ZONE]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type ZSA_[numero]]]></description>
-      <type><![CDATA[String]]></type>
-      <size>30</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4adad6bd65a68a90defbe25a76d0ddaf]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[Valeur nulle interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <reference><![CDATA[N_prefixTri_TRI_S_ddd.ID_TRI]]></reference>
-    </attribute>
-    <attribute>
-      <id><![CDATA[90ea19d80d3f08471b24d1763f5cb453]]></id>
-      <name><![CDATA[SCENARIO]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[04Fai]]></value>
-        <value><![CDATA[01For]]></value>
-        <value><![CDATA[02Moy]]></value>
-        <value><![CDATA[03Mcc]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[96db45334b8c3388c4470856946f92a9]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ea6cc707e0e9309d0f1edf411056d0c3]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_TRI_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_TRI_S_ddd.json
new file mode 100644
index 00000000..78b81d74
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_TRI_S_ddd.json
@@ -0,0 +1,83 @@
+{
+    "id": "fc40ca2a89bfe0e66b6d7ca9084783d3",
+    "name": "N_prefixTri_TRI_S_ddd",
+    "columns": [
+        {
+            "id": "50657730fcbf1639aff214658d973bdf",
+            "name": "TX_HAB_SAI",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "596f8bacd6106e5a78698c4d7cc8b422",
+            "name": "NOM",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "maxLength": 254
+            }
+        },
+        {
+            "id": "826f1a906f914a20e79e5b270d343e94",
+            "name": "HAB_SAISON",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "834f5775bfa7b3ab42101923f3f7f55f",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "c27a38213c5d8477e66fa27977d189fd",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "e3494002d678835aac24600a877db3fa",
+            "name": "ID_TRI",
+            "description": "COVADIS B1.2. - Identifiant de type [Code EUUOM Bassin DCE]_TRI_[Nom court TRI]. Exemple : \"FRD_TRI_LYON\"",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "^FR[A-Z0-9]{1,4}_TRI_[A-Z_0-9]{1,33}$",
+                "maxLength": 50
+            }
+        },
+        {
+            "id": "f85fac7eb484c62c3721e4f9306da702",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "f9732b41e6a21ec58c40c428a50da51d",
+            "name": "HAB_PERM",
+            "type": "Integer",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_TRI_S_ddd.xml b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_TRI_S_ddd.xml
deleted file mode 100644
index 21859eb2..00000000
--- a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_TRI_S_ddd.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[40ee150106902bc1da3743c79c2e737b]]></id>
-  <typeName><![CDATA[N_prefixTri_TRI_S_ddd]]></typeName>
-  <attributes>
-    <attribute>
-      <id><![CDATA[03489de0a2bf1d22df5f7f29031ae9ce]]></id>
-      <name><![CDATA[HAB_SAISON]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[10b4b7abd10d5cf18d13144181b1673a]]></id>
-      <name><![CDATA[DATSORTIE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[132561c55f0b21f50dac10e74d1c6aae]]></id>
-      <name><![CDATA[HAB_PERM]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[457b4e9ec5a0e5e974dc9a647149222f]]></id>
-      <name><![CDATA[WKT]]></name>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[71f490e3e52f8a79c42c32f4370cf50c]]></id>
-      <name><![CDATA[DATENTREE]]></name>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9aae6e8b71d85de03609106104eab3a2]]></id>
-      <name><![CDATA[NOM]]></name>
-      <description><![CDATA[Valeur vide interdite]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[f7074f1b5f2d7f98903927a88cdda2de]]></id>
-      <name><![CDATA[TX_HAB_SAI]]></name>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <regexp><![CDATA[^FR[A-Z0-9]{1,4}_TRI_[A-Z0-9_-]{1,33}$]]></regexp>
-      <id><![CDATA[f7cd0d9fbcdb7cefafdf5510fe03984f]]></id>
-      <name><![CDATA[ID_TRI]]></name>
-      <description><![CDATA[COVADIS B1.2. - Identifiant de type [Code EUUOM Bassin DCE]_TRI_[Nom court TRI]. Exemple : "FRD_TRI_LYON"]]></description>
-      <type><![CDATA[String]]></type>
-      <size>50</size>
-      <nullable>false</nullable>
-      <identifier>true</identifier>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ZONE_PROTEG_S_ddd.json b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ZONE_PROTEG_S_ddd.json
new file mode 100644
index 00000000..81dbdf52
--- /dev/null
+++ b/validator-plugin-dgpr/src/test/resources/config/covadis_di_2018/types/N_prefixTri_ZONE_PROTEG_S_ddd.json
@@ -0,0 +1,104 @@
+{
+    "id": "6752da9c4e4eca4a180d92d94c0385d9",
+    "name": "N_prefixTri_ZONE_PROTEG_S_ddd",
+    "columns": [
+        {
+            "id": "09648eab37a50c5379580e40cad32951",
+            "name": "SCENARIO",
+            "description": "Valeur vide interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "enum": [
+                    "04Fai_100",
+                    "04Faicc_ct",
+                    "01Forcc_ct",
+                    "01Forcc_100",
+                    "03Mcc_ct",
+                    "04Fai",
+                    "01For",
+                    "02Moy",
+                    "03Mcc"
+                ]
+            }
+        },
+        {
+            "id": "66968cdfe141ea7265660810f4085999",
+            "name": "WKT",
+            "type": "MultiPolygon",
+            "constraints": {
+                "required": false,
+                "unique": false
+            }
+        },
+        {
+            "id": "6bedd4c9b27eacf3ce58a8bea62d0d99",
+            "name": "ZP",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "77b0ca4c7bfdf9ddb3e145ca23aad91d",
+            "name": "ID_TRI",
+            "description": "Valeur nulle interdite",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": false,
+                "reference": "N_prefixTri_TRI_S_ddd.ID_TRI"
+            }
+        },
+        {
+            "id": "a3b7308550cec554f718ac40da776d87",
+            "name": "EST_REF",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "a97bce40559b1bc31146a7691554bff3",
+            "name": "ID_ZONE",
+            "description": "COVADIS B1.2. - Identifiant de type ZP(P)_[numero]",
+            "type": "String",
+            "constraints": {
+                "required": false,
+                "unique": true,
+                "pattern": "ZPP?_[0-9]+$",
+                "maxLength": 30
+            }
+        },
+        {
+            "id": "b26a33c30a7d66ffb7bf7caf51c8fa9f",
+            "name": "DATENTREE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "d05e60c57b8d6a6021f1e38f3515eda1",
+            "name": "ZPP",
+            "type": "Boolean",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        },
+        {
+            "id": "ef79bb40ea54d87d964f8fd93c431bc1",
+            "name": "DATSORTIE",
+            "type": "Date",
+            "constraints": {
+                "required": true,
+                "unique": false
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/validator-plugin-pcrs/pom.xml b/validator-plugin-pcrs/pom.xml
index c6622803..f1369b33 100644
--- a/validator-plugin-pcrs/pom.xml
+++ b/validator-plugin-pcrs/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>fr.ign.validator</groupId>
 		<artifactId>validator</artifactId>
-		<version>4.4.6-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<name>validator-plugin-pcrs</name>
 	<artifactId>validator-plugin-pcrs</artifactId>