diff --git a/README.md b/README.md
index 2ef300f123c2a7886c4785290929a0eb110b9308..d00d38dc5c326d228cb56cc67343e16b419a6200 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # TOP: TDL Open source Project: Extras
 
-This repository contains additional components for the TDL Open source Project (TOP). Currently it only includes a wrapper for the OpenAPI Generator. 
+This repository contains additional components for the TDL Open source Project (TOP). Currently, it includes:
+- a wrapper for the OpenAPI Generator
+- a wrapper for the YANG Tools
 
 More info at [TDL website](https://tdl.etsi.org)
 
diff --git a/features/org.etsi.mts.tdl.extras.feature/.project b/features/org.etsi.mts.tdl.extras.feature/.project
index 48930562a51a72b58e8035eeb5f6ff73c3fb20c6..b1983061742bb7c3b13b32dca5d4f6f6c5525f75 100644
--- a/features/org.etsi.mts.tdl.extras.feature/.project
+++ b/features/org.etsi.mts.tdl.extras.feature/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424736</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/features/org.etsi.mts.tdl.extras.feature/feature.xml b/features/org.etsi.mts.tdl.extras.feature/feature.xml
index fc35bce8d2363cf06f50bbf7e3634f9cceb38c38..a37b59e80c83015304df4373f200278efe67fa0b 100644
--- a/features/org.etsi.mts.tdl.extras.feature/feature.xml
+++ b/features/org.etsi.mts.tdl.extras.feature/feature.xml
@@ -314,5 +314,11 @@ any resulting litigation.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+   <plugin
+         id="org.etsi.mts.tdl.extras.yang.tools.wrapper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/org.etsi.mts.tdl.extras.parent/.project b/org.etsi.mts.tdl.extras.parent/.project
index e7f8fef747066b477be0914076f6191d63ccda47..dea320ecb636d4ea09fc3062eb6929aac95297e8 100644
--- a/org.etsi.mts.tdl.extras.parent/.project
+++ b/org.etsi.mts.tdl.extras.parent/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424740</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/org.etsi.mts.tdl.extras.parent/pom.xml b/org.etsi.mts.tdl.extras.parent/pom.xml
index 526f034a497a98d2d305c039f48376a4c678dbe1..3243ea528368e5dda7116620a2bbfe9dd7248a77 100644
--- a/org.etsi.mts.tdl.extras.parent/pom.xml
+++ b/org.etsi.mts.tdl.extras.parent/pom.xml
@@ -11,6 +11,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<modules>
 		<!-- Converters -->
 		<module>../plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper</module>
+		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper</module>
 		<!-- Features -->
 		<module>../features/org.etsi.mts.tdl.extras.feature</module> 
 		<!-- Update Site -->
diff --git a/plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper/README.md b/plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper/README.md
index 2b0038941c2e58d345748ac6473abe28018e9972..848e0d4772565169ad5cd7f22462cc0bdd629e42 100644
--- a/plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper/README.md
+++ b/plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper/README.md
@@ -1,3 +1,3 @@
 # OpenAPI Generator Wrapper
 
-This plug-in wraps the [OpenAPI Generator](https://openapi-generator.tech) licensed unter the Apache 2.0 Software License for consumption as an Eclipse plug-in. It is currently used as a dependency in the OpenAPI-to-TDL generator and in the OpenAPI Generator UI components.
\ No newline at end of file
+This plug-in wraps the [OpenAPI Generator](https://openapi-generator.tech) licensed under the Apache 2.0 Software Licence for consumption as an Eclipse plug-in. It is currently used as a dependency in the OpenAPI-to-TDL generator and in the OpenAPI Generator UI components.
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..74755f6584ad0277e8e6010b93fb9d84ad1095ee
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.classpath
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/antlr4-runtime-4.11.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/checker-qual-3.12.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/concepts-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/error_prone_annotations-2.11.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/failureaccess-1.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/gson-2.9.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/guava-31.1-jre.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/j2objc-annotations-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsr305-3.0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/odlext-model-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/odlext-parser-support-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rfc7952-model-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-2.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-2.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/triemap-1.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/util-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-common-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-ir-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-model-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-model-ri-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-model-spi-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-reactor-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-rfc7950-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-spi-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-repo-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-repo-spi-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-xpath-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-xpath-impl-10.0.4.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.project b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.project
new file mode 100644
index 0000000000000000000000000000000000000000..87a5ec3d188020f0818bb15f33d954677e53ce84
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.project
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.etsi.mts.tdl.extras.yang.tools.wrapper</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424744</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.core.resources.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.jdt.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.m2e.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..f2e6621d9486fab0c2f1a55fd500d05c28a88104
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/META-INF/MANIFEST.MF
@@ -0,0 +1,56 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YANG Generator Wrapper
+Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper
+Bundle-Version: 1.0.0.qualifier
+Export-Package: org.opendaylight.yangtools.odlext.parser,
+ org.opendaylight.yangtools.yang.common,
+ org.opendaylight.yangtools.yang.model.api,
+ org.opendaylight.yangtools.yang.model.api.meta,
+ org.opendaylight.yangtools.yang.model.api.stmt,
+ org.opendaylight.yangtools.yang.model.api.type,
+ org.opendaylight.yangtools.yang.model.repo.api,
+ org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff,
+ org.opendaylight.yangtools.yang.model.ri.type,
+ org.opendaylight.yangtools.yang.model.spi,
+ org.opendaylight.yangtools.yang.model.spi.meta,
+ org.opendaylight.yangtools.yang.parser.api,
+ org.opendaylight.yangtools.yang.parser.rfc7950.reactor,
+ org.opendaylight.yangtools.yang.parser.rfc7950.repo,
+ org.opendaylight.yangtools.yang.parser.spi.meta,
+ org.opendaylight.yangtools.yang.parser.spi.source,
+ org.opendaylight.yangtools.yang.parser.stmt.reactor
+Bundle-Vendor: ETSI
+Bundle-ClassPath: lib/antlr4-runtime-4.11.1.jar,
+ lib/checker-qual-3.12.0.jar,
+ lib/concepts-10.0.4.jar,
+ lib/error_prone_annotations-2.11.0.jar,
+ lib/failureaccess-1.0.1.jar,
+ lib/gson-2.9.1.jar,
+ lib/guava-31.1-jre.jar,
+ lib/hamcrest-core-1.3.jar,
+ lib/j2objc-annotations-1.3.jar,
+ lib/jsr305-3.0.2.jar,
+ lib/junit-4.11.jar,
+ lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,
+ lib/odlext-model-api-10.0.4.jar,
+ lib/odlext-parser-support-10.0.4.jar,
+ lib/rfc7952-model-api-10.0.4.jar,
+ lib/slf4j-api-2.0.6.jar,
+ lib/slf4j-simple-2.0.6.jar,
+ lib/triemap-1.2.0.jar,
+ lib/util-10.0.4.jar,
+ lib/yang-common-10.0.4.jar,
+ lib/yang-ir-10.0.4.jar,
+ lib/yang-model-api-10.0.4.jar,
+ lib/yang-model-ri-10.0.4.jar,
+ lib/yang-model-spi-10.0.4.jar,
+ lib/yang-parser-api-10.0.4.jar,
+ lib/yang-parser-reactor-10.0.4.jar,
+ lib/yang-parser-rfc7950-10.0.4.jar,
+ lib/yang-parser-spi-10.0.4.jar,
+ lib/yang-repo-api-10.0.4.jar,
+ lib/yang-repo-spi-10.0.4.jar,
+ lib/yang-xpath-api-10.0.4.jar,
+ lib/yang-xpath-impl-10.0.4.jar
+Automatic-Module-Name: org.etsi.mts.tdl.yang2tdl
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/README.md b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c6350436c6ed1ba95f9f6a4e3803f30af639ed48
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/README.md
@@ -0,0 +1,3 @@
+# YANG Tools Wrapper
+
+This plug-in wraps the [YANG Tools](https://wiki.opendaylight.org/display/ODL/YANG+Tools) licensed under the EPL 1.0 Software Licence for consumption as an Eclipse plug-in. It is currently used as a dependency in the YANG-to-TDL generator.
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/build.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5e583bef6e838eeef37e83280569b85987726bbf
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               lib/
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/antlr4-runtime-4.11.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/antlr4-runtime-4.11.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7d57b59c0ac6b1c5c64c377b1c3b93e419ebb364
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/antlr4-runtime-4.11.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/checker-qual-3.12.0.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/checker-qual-3.12.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e9eed802e7df5d6989158c3bcfc58cd30dea7d81
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/checker-qual-3.12.0.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/concepts-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/concepts-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d6380ceb3a324c72082892b99ca6dfd9f19a66e1
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/concepts-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/error_prone_annotations-2.11.0.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/error_prone_annotations-2.11.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bec76567f69c8887918695013f68b13351cb7fe2
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/error_prone_annotations-2.11.0.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/failureaccess-1.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/failureaccess-1.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9b56dc751c1cc7dff75ed80ccbb45f027058e8ce
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/failureaccess-1.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/gson-2.9.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/gson-2.9.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8a663ecceb9d43bfb89fd82b437a2cf55e52ad04
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/gson-2.9.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/guava-31.1-jre.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/guava-31.1-jre.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1681922939a1ee7a4558b9bedfb40f00824277fd
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/guava-31.1-jre.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/hamcrest-core-1.3.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/hamcrest-core-1.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9d5fe16e3dd37ebe79a36f61f5d0e1a69a653a8a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/hamcrest-core-1.3.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/j2objc-annotations-1.3.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/j2objc-annotations-1.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a429c7219d30e797d4a6b3cfb579266f323dd030
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/j2objc-annotations-1.3.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/jsr305-3.0.2.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/jsr305-3.0.2.jar
new file mode 100644
index 0000000000000000000000000000000000000000..59222d9ca5e5654f5dcf6680783d0e265baa848f
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/jsr305-3.0.2.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/junit-4.11.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/junit-4.11.jar
new file mode 100644
index 0000000000000000000000000000000000000000..aaf74448492932e95902b40a70c7a4da5bad4744
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/junit-4.11.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
new file mode 100644
index 0000000000000000000000000000000000000000..45832c052a10428a5b18613470458e1a2e0e941a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/odlext-model-api-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/odlext-model-api-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f3dc68bc5109f86697107f1a49cb1460afda7b5c
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/odlext-model-api-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/odlext-parser-support-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/odlext-parser-support-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b9445d71e1eade98b2aa95de9fa4de1e4e91ebcf
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/odlext-parser-support-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/rfc7952-model-api-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/rfc7952-model-api-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..edf4fd64fce914ea1a7a4910dcbad80e7bdcc895
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/rfc7952-model-api-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/slf4j-api-2.0.6.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/slf4j-api-2.0.6.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a2cb8020a5afda869b487e2f9d172dcd1e9795bf
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/slf4j-api-2.0.6.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/slf4j-simple-2.0.6.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/slf4j-simple-2.0.6.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f8913c0a8caf34877b66c316f2c12d3a39cf4a9a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/slf4j-simple-2.0.6.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/triemap-1.2.0.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/triemap-1.2.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..08ca194b59f7bb6437bc09b8f33773ea454d6257
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/triemap-1.2.0.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/util-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/util-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..21f8516064b9d9a9c019183642f5811526c37308
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/util-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-common-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-common-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9bd54af141c19b509907203e721f7984bccbac06
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-common-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-ir-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-ir-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e8cff541f3c2854f7cdc0501def4ef41eabd370d
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-ir-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-api-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-api-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..da346b472e686c868e59e6ae4313bd3dee567f47
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-api-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-ri-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-ri-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..48307dc9389d6a56e1e76b50523fd50bb947008a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-ri-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-spi-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-spi-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c3fa933f1bfbffee3d36055b1543d956acd21192
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-model-spi-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-api-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-api-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5e2bf15cec475481fe8ae79b77fc11cb20afeb9f
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-api-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-reactor-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-reactor-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b547a89c0b0c44dc4d0b791bbe977d08e96ea5e6
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-reactor-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-rfc7950-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-rfc7950-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6bf142a28d2d854b89b0be754676385f0d413038
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-rfc7950-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-spi-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-spi-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3f452898947aa61299e2171a8b322ce24a50fb5c
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-parser-spi-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-repo-api-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-repo-api-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0a590f186dab7620176e045339b61c95ab629dce
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-repo-api-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-repo-spi-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-repo-spi-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bde5cd1facf4665e3bc837283a420abca2aa6559
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-repo-spi-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-xpath-api-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-xpath-api-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7c922c14c7cac67e6b7520e5c0c45b700023abc5
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-xpath-api-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-xpath-impl-10.0.4.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-xpath-impl-10.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9569ad209aa5e63c593b90a5a9d10cb6137462f0
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/lib/yang-xpath-impl-10.0.4.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d61fd37fa8e1ff0f4718ca7c46c4d69cd448c87f
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/pom.xml
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.etsi.mts.tdl.extras</groupId>
+		<artifactId>org.etsi.mts.tdl.extras.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../org.etsi.mts.tdl.extras.parent</relativePath>
+	</parent>
+	<artifactId>org.etsi.mts.tdl.extras.yang.tools.wrapper</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+<!-- 
+	<dependencies>
+		<dependency>
+		    <groupId>org.opendaylight.yangtools</groupId>
+		    <artifactId>yang-parser-api</artifactId>
+		    <version>11.0.5</version>
+		</dependency>		
+	</dependencies>
+-->
+</project>
\ No newline at end of file
diff --git a/updatesite/org.etsi.mts.tdl.extras.updatesite/.project b/updatesite/org.etsi.mts.tdl.extras.updatesite/.project
index 2da50a50a380114bf5ed35bd1caae3878faafa5d..0958fba9bdda8f1db3655045b8aa9e71469e3df2 100644
--- a/updatesite/org.etsi.mts.tdl.extras.updatesite/.project
+++ b/updatesite/org.etsi.mts.tdl.extras.updatesite/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424743</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>