diff --git a/features/org.etsi.mts.tdl.extras.feature/feature.xml b/features/org.etsi.mts.tdl.extras.feature/feature.xml
index a37b59e80c83015304df4373f200278efe67fa0b..4aba6f288f30b9856e625ebddebf1c8efa5485fc 100644
--- a/features/org.etsi.mts.tdl.extras.feature/feature.xml
+++ b/features/org.etsi.mts.tdl.extras.feature/feature.xml
@@ -314,6 +314,7 @@ 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"
@@ -321,4 +322,18 @@ any resulting litigation.
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+<!--
+   <plugin
+         id="org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+-->
 </feature>
diff --git a/org.etsi.mts.tdl.extras.parent/pom.xml b/org.etsi.mts.tdl.extras.parent/pom.xml
index 3243ea528368e5dda7116620a2bbfe9dd7248a77..018e747915512cde881d5119d71d745a04fe6668 100644
--- a/org.etsi.mts.tdl.extras.parent/pom.xml
+++ b/org.etsi.mts.tdl.extras.parent/pom.xml
@@ -11,7 +11,12 @@ 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.mvn/dependencies</module>
+		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn</module>
 		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper</module>
+		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd</module>
+		<!-- 
+		-->
 		<!-- Features -->
 		<module>../features/org.etsi.mts.tdl.extras.feature</module> 
 		<!-- Update Site -->
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..09a96d3bb9f26bc45100a5aa9c1f8a5ec065dad5
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.classpath
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-codec-gson/13.0.1/yang-data-codec-gson-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-codec-gson/13.0.1/yang-data-codec-gson-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.10.1/gson-2.10.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/32.1.3-jre/guava-32.1.3-jre.jar" sourcepath="M2_REPO/com/google/guava/guava/32.1.3-jre/guava-32.1.3-jre-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" sourcepath="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/checkerframework/checker-qual/3.37.0/checker-qual-3.37.0.jar" sourcepath="M2_REPO/org/checkerframework/checker-qual/3.37.0/checker-qual-3.37.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1.jar" sourcepath="M2_REPO/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar" sourcepath="M2_REPO/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/org.eclipse.jdt.annotation/2.2.800/org.eclipse.jdt.annotation-2.2.800.jar" sourcepath="M2_REPO/org/eclipse/jdt/org.eclipse.jdt.annotation/2.2.800/org.eclipse.jdt.annotation-2.2.800-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/util/13.0.1/util-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/util/13.0.1/util-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/concepts/13.0.1/concepts-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/concepts/13.0.1/concepts-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/tech/pantheon/triemap/triemap/1.3.1/triemap-1.3.1.jar" sourcepath="M2_REPO/tech/pantheon/triemap/triemap/1.3.1/triemap-1.3.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-common/13.0.1/yang-common-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-common/13.0.1/yang-common-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-api/13.0.1/yang-data-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-api/13.0.1/yang-data-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/immutables/value/2.10.0/value-2.10.0-annotations.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-api/13.0.1/yang-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-api/13.0.1/yang-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-xpath-api/13.0.1/yang-xpath-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-xpath-api/13.0.1/yang-xpath-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-impl/13.0.1/yang-data-impl-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-impl/13.0.1/yang-data-impl-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-spi/13.0.1/yang-data-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-spi/13.0.1/yang-data-spi-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-util/13.0.1/yang-data-util-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-util/13.0.1/yang-data-util-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-util/13.0.1/yang-model-util-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-util/13.0.1/yang-model-util-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-spi/13.0.1/yang-model-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-spi/13.0.1/yang-model-spi-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-ir/13.0.1/yang-ir-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-ir/13.0.1/yang-ir-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc7952-model-api/13.0.1/rfc7952-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc7952-model-api/13.0.1/rfc7952-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8040-model-api/13.0.1/rfc8040-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8040-model-api/13.0.1/rfc8040-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8528-model-api/13.0.1/rfc8528-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8528-model-api/13.0.1/rfc8528-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8819-parser-support/13.0.1/rfc8819-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8819-parser-support/13.0.1/rfc8819-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-api/13.0.1/yang-parser-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-api/13.0.1/yang-parser-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-spi/13.0.1/yang-parser-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-spi/13.0.1/yang-parser-spi-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8819-model-api/13.0.1/rfc8819-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8819-model-api/13.0.1/rfc8819-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-rfc7950/13.0.1/yang-parser-rfc7950-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-rfc7950/13.0.1/yang-parser-rfc7950-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.jar" sourcepath="M2_REPO/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-ri/13.0.1/yang-model-ri-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-ri/13.0.1/yang-model-ri-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-reactor/13.0.1/yang-parser-reactor-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-reactor/13.0.1/yang-parser-reactor-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-repo-api/13.0.1/yang-repo-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-repo-api/13.0.1/yang-repo-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-repo-spi/13.0.1/yang-repo-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-repo-spi/13.0.1/yang-repo-spi-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/odlext-parser-support/13.0.1/odlext-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/odlext-parser-support/13.0.1/odlext-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/odlext-model-api/13.0.1/odlext-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/odlext-model-api/13.0.1/odlext-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-impl/13.0.1/yang-parser-impl-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-impl/13.0.1/yang-parser-impl-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/openconfig-parser-support/13.0.1/openconfig-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/openconfig-parser-support/13.0.1/openconfig-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/openconfig-model-api/13.0.1/openconfig-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/openconfig-model-api/13.0.1/openconfig-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6241-parser-support/13.0.1/rfc6241-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6241-parser-support/13.0.1/rfc6241-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6241-model-api/13.0.1/rfc6241-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6241-model-api/13.0.1/rfc6241-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6536-parser-support/13.0.1/rfc6536-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6536-parser-support/13.0.1/rfc6536-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6536-model-api/13.0.1/rfc6536-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6536-model-api/13.0.1/rfc6536-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6643-parser-support/13.0.1/rfc6643-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6643-parser-support/13.0.1/rfc6643-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6643-model-api/13.0.1/rfc6643-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6643-model-api/13.0.1/rfc6643-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc7952-parser-support/13.0.1/rfc7952-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc7952-parser-support/13.0.1/rfc7952-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8040-parser-support/13.0.1/rfc8040-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8040-parser-support/13.0.1/rfc8040-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8528-parser-support/13.0.1/rfc8528-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8528-parser-support/13.0.1/rfc8528-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8639-parser-support/13.0.1/rfc8639-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8639-parser-support/13.0.1/rfc8639-parser-support-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8639-model-api/13.0.1/rfc8639-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8639-model-api/13.0.1/rfc8639-model-api-13.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-xpath-impl/13.0.1/yang-xpath-impl-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-xpath-impl/13.0.1/yang-xpath-impl-13.0.1-sources.jar"/>
+</classpath>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.project b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.project
new file mode 100644
index 0000000000000000000000000000000000000000..95f1968bd438080adb8aba48eca43ebf972cf971
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.project
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+  <name>org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd</name>
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.pde.ManifestBuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.pde.SchemaBuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.m2e.core.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.m2e.core.maven2Nature</nature>
+    <nature>org.eclipse.pde.PluginNature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.settings/org.eclipse.core.resources.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.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.bnd/.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.bnd/.settings/org.eclipse.jdt.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.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.bnd/.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.bnd/.settings/org.eclipse.m2e.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.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.bnd/.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.bnd/META-INF/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/META-INF/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..78d910160c4b6a2be02b1060dfbc5a0ec2526bb1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/META-INF/.gitignore
@@ -0,0 +1,2 @@
+/*
+!.gitignore
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/README.md b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f7dd200267faecfddd39c00546937ec1875feb53
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/README.md
@@ -0,0 +1,5 @@
+# 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.
+
+This is a more streamlined version relying on BND, not fully working yet, cannot be integrated in the feature for some reason. Additional artifacts generated with `mvn package eclipse:eclipse -Declipse.pde`, see also [the corresponding documentation](https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html#_eclipsepde_integration).
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/build.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..54c09fc44f212d17a00d0b22c405bd4dd35c7564
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               libs/
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/libs/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/libs/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..78d910160c4b6a2be02b1060dfbc5a0ec2526bb1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/libs/.gitignore
@@ -0,0 +1,2 @@
+/*
+!.gitignore
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..16aada426872491f91cd76c40d8db43956100e8f
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/pom.xml
@@ -0,0 +1,143 @@
+<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.bnd</artifactId>
+	<packaging>bundle</packaging>
+	<name>${project.artifactId}</name>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>bnd-releases</id>
+			<url>https://bndtools.jfrog.io/bndtools/libs-release/</url>
+			<layout>default</layout>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<properties>
+		<!--        
+    <import.packages>*</import.packages>
+    <private.packages>!*</private.packages>
+    <embed-dep>*;type=!pom;inline=true</embed-dep>
+    <embed-dep>*</embed-dep>
+		<export.packages>org.opendaylight.yangtools.*;version=${unpack.version}</export.packages>
+    <embed-dep>*;scope=provided;type=!pom;inline=true</embed-dep>
+-->
+		<export.packages>org.opendaylight.yangtools.*</export.packages>
+		<embed-dep>*;scope=compile|runtime</embed-dep>
+		<symbolic.name>${project.artifactId}</symbolic.name>
+		<bundle.symbolicName>${project.artifactId}</bundle.symbolicName>
+	    <bundle.namespace>org.example</bundle.namespace>
+		
+		<unpack-bundle>false</unpack-bundle>
+	</properties>
+
+	<build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+    </resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>5.1.9</version>
+				<configuration>
+		          <manifestLocation>META-INF</manifestLocation>
+					<unpackBundle>${unpack.bundle}</unpackBundle>
+					<instructions>
+						<Bundle-Name>${project.artifactId}</Bundle-Name>
+						<Bundle-SymbolicName>${symbolic.name}</Bundle-SymbolicName>
+						<Bundle-Description>${project.name}</Bundle-Description>
+			            <Bundle-Version>${project.version}</Bundle-Version>
+                		<Import-Package>java.io</Import-Package>
+						<!--        
+                <Private-Package>${private.packages}</Private-Package>
+-->
+						<Include-Resource>${include.resources}</Include-Resource>
+						<Embed-Dependency>${embed-dep}</Embed-Dependency>
+						<_exportcontents>${export.packages}</_exportcontents>
+						<Embed-Transitive>true</Embed-Transitive>
+						<_include>template/MANIFEST.MF</_include>
+			            <Embed-Directory>target/dependency</Embed-Directory>
+					</instructions>
+				</configuration>
+				<extensions>true</extensions>
+			</plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-data-codec-gson</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>rfc8819-parser-support</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-rfc7950</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-spi</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-api</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>odlext-parser-support</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-impl</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-repo-api</artifactId>
+			<version>13.0.1</version>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/template/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/template/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..455e7064494d1af301e311272b13a07f1ecb3032
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/template/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YANG Generator Wrapper
+Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: ETSI
+Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..262ccf3dc32c21f9e6ff8afced619538dff55df4
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.gitignore
@@ -0,0 +1,3 @@
+.classpath
+dependencies/classpath.properties
+META-INF/MANIFEST.MF
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project
new file mode 100644
index 0000000000000000000000000000000000000000..0362a465bb10b289b83d572ad3f0d12d9fb68f1e
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn</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.mvn/.settings/org.eclipse.core.resources.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.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.mvn/.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.mvn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.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.mvn/.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.mvn/.settings/org.eclipse.m2e.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.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.mvn/.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.mvn/META-INF/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..78d910160c4b6a2be02b1060dfbc5a0ec2526bb1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/.gitignore
@@ -0,0 +1,2 @@
+/*
+!.gitignore
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..a0b44cd704a56dd1a171d08cf70265d6d0b3cd1a
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF
@@ -0,0 +1,85 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YANG Generator Wrapper
+Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
+Bundle-Version: 1.0.0.qualifier
+Export-Package: org.opendaylight.yangtools.concepts,
+ org.opendaylight.yangtools.odlext.parser,
+ org.opendaylight.yangtools.yang.common,
+ org.opendaylight.yangtools.yang.data.api.schema,
+ org.opendaylight.yangtools.yang.data.api.schema.stream,
+ org.opendaylight.yangtools.yang.data.codec.gson,
+ org.opendaylight.yangtools.yang.data.spi.node,
+ 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.model.spi.source,
+ org.opendaylight.yangtools.yang.model.util,
+ org.opendaylight.yangtools.yang.xpath.api,
+ 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
+Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
+Bundle-ClassPath: libs/yang-data-codec-gson-13.0.1.jar,
+ libs/gson-2.10.1.jar,
+ libs/guava-32.1.3-jre.jar,
+ libs/failureaccess-1.0.1.jar,
+ libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,
+ libs/checker-qual-3.37.0.jar,
+ libs/error_prone_annotations-2.21.1.jar,
+ libs/j2objc-annotations-2.8.jar,
+ libs/org.eclipse.jdt.annotation-2.2.800.jar,
+ libs/util-13.0.1.jar,
+ libs/triemap-1.3.1.jar,
+ libs/yang-common-13.0.1.jar,
+ libs/yang-data-api-13.0.1.jar,
+ libs/value-2.10.0-annotations.jar,
+ libs/yang-data-impl-13.0.1.jar,
+ libs/yang-data-spi-13.0.1.jar,
+ libs/yang-data-util-13.0.1.jar,
+ libs/rfc8528-model-api-13.0.1.jar,
+ libs/yang-model-api-13.0.1.jar,
+ libs/yang-model-util-13.0.1.jar,
+ libs/rfc8040-model-api-13.0.1.jar,
+ libs/rfc8819-parser-support-13.0.1.jar,
+ libs/yang-model-spi-13.0.1.jar,
+ libs/rfc7952-model-api-13.0.1.jar,
+ libs/rfc8819-model-api-13.0.1.jar,
+ libs/yang-parser-rfc7950-13.0.1.jar,
+ libs/antlr4-runtime-4.13.1.jar,
+ libs/concepts-13.0.1.jar,
+ libs/yang-model-ri-13.0.1.jar,
+ libs/yang-parser-reactor-13.0.1.jar,
+ libs/yang-ir-13.0.1.jar,
+ libs/yang-repo-spi-13.0.1.jar,
+ libs/yang-xpath-api-13.0.1.jar,
+ libs/yang-parser-spi-13.0.1.jar,
+ libs/yang-parser-api-13.0.1.jar,
+ libs/odlext-parser-support-13.0.1.jar,
+ libs/odlext-model-api-13.0.1.jar,
+ libs/yang-parser-impl-13.0.1.jar,
+ libs/openconfig-parser-support-13.0.1.jar,
+ libs/openconfig-model-api-13.0.1.jar,
+ libs/rfc6241-parser-support-13.0.1.jar,
+ libs/rfc6241-model-api-13.0.1.jar,
+ libs/rfc6536-parser-support-13.0.1.jar,
+ libs/rfc6536-model-api-13.0.1.jar,
+ libs/rfc6643-parser-support-13.0.1.jar,
+ libs/rfc6643-model-api-13.0.1.jar,
+ libs/rfc7952-parser-support-13.0.1.jar,
+ libs/rfc8040-parser-support-13.0.1.jar,
+ libs/rfc8528-parser-support-13.0.1.jar,
+ libs/rfc8639-parser-support-13.0.1.jar,
+ libs/rfc8639-model-api-13.0.1.jar,
+ libs/yang-xpath-impl-13.0.1.jar,
+ libs/yang-repo-api-13.0.1.jar
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..679aa8ccad83b886ca5da5f8e8f0fc4f2963e933
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md
@@ -0,0 +1,13 @@
+# 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.
+
+The dependencies are specified and fetched from Maven in the nested dependencies folder, then copied to the libs folder. The MANIFEST.MF and .classpath files are updated accordingly as part of the build. 
+
+Note: Offline builds run fine. When loading the project in Eclipse it seems to require that the .classpath is set to export all the jars. 
+
+After some testing, this should supersede the manually managed version. 
+
+Note: Typos in the manifest (template) can have disastrous consequences.
+
+TODO: Explore using Maven artifacts directly as part of the target platform? 
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..54c09fc44f212d17a00d0b22c405bd4dd35c7564
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               libs/
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..006eb7b39c6833045b3fc8d8bd0502134af17704
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
@@ -0,0 +1,174 @@
+<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.mvn.dependencies</artifactId>
+	<packaging>jar</packaging>
+	<!-- 
+		Nested pom for downloading dependencies
+	-->
+	<properties>
+		<classpath.placeholder>!:!</classpath.placeholder>
+		<classpath.separator>"/>${line.separator}    &lt;classpathentry exported="true" kind="lib" path="</classpath.separator>
+		<!-- "/>${line.separator}	<classpathentry exported="true" kind="lib" path=" -->
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets combine.children="append">
+						<fileset>
+							<directory>${basedir}/../libs/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+							</excludes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>build-classpath</goal>
+						</goals>
+						<configuration>
+							<outputFilterFile>true</outputFilterFile>
+							<prefix>libs</prefix>
+							<regenerateFile>true</regenerateFile>
+							<pathSeparator>${classpath.placeholder}</pathSeparator>
+							<outputFile>${basedir}/classpath.properties</outputFile>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/../libs</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>
+							${project.build.outputDirectory}/META-INF/MANIFEST.MF
+						</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>fix-manifest</id>
+						<phase>test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+                            <!-- <tasks>
+                                <echo>Update MANIFEST: ${project.build.outputDirectory}/META-INF/MANIFEST.MF</echo>
+                                <echo>Replace ${classpath.placeholder} with ,${line.separator} </echo>
+                            </tasks> -->
+							<target>
+								<replace file="${project.build.outputDirectory}/META-INF/MANIFEST.MF" 
+									token="${classpath.placeholder}"
+									value=",${line.separator} " />
+								<replace file="${project.build.outputDirectory}/.classpath" 
+									token="${classpath.placeholder}"
+									value="${classpath.separator}" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<filters>
+			<filter>${basedir}/classpath.properties</filter>
+		</filters>
+		<resources>
+			<resource>
+				<directory>${basedir}/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
+	<!-- 
+	<dependencies>
+		<dependency>
+		    <groupId>org.opendaylight.yangtools</groupId>
+		    <artifactId>yang-parser-api</artifactId>
+		    <version>11.0.5</version>
+		</dependency>		
+	</dependencies>
+	implementation 'org.opendaylight.yangtools:yang-parser-impl:13.0.1'
+    implementation 'org.opendaylight.yangtools:rfc8819-parser-support:13.0.1'
+    implementation 'org.opendaylight.yangtools:yang-data-codec-gson:13.0.1'
+-->
+	<dependencies>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-data-codec-gson</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>rfc8819-parser-support</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-rfc7950</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-spi</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-api</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>odlext-parser-support</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-parser-impl</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-repo-api</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..04acac2d274ac37a24f153264f0657b3f31f869f
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<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 exported="true" kind="lib" path="${classpath}"/>	
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..c7788c4408c4a2a703b4056672d8437030f7fb36
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YANG Generator Wrapper
+Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
+Bundle-Version: 1.0.0.qualifier
+Export-Package: org.opendaylight.yangtools.concepts,
+ org.opendaylight.yangtools.odlext.parser,
+ org.opendaylight.yangtools.yang.common,
+ org.opendaylight.yangtools.yang.data.api.schema,
+ org.opendaylight.yangtools.yang.data.api.schema.stream,
+ org.opendaylight.yangtools.yang.data.codec.gson,
+ org.opendaylight.yangtools.yang.data.spi.node,
+ 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.model.spi.source,
+ org.opendaylight.yangtools.yang.model.util,
+ org.opendaylight.yangtools.yang.xpath.api,
+ 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
+Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
+Bundle-ClassPath: ${classpath}
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/lib/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/lib/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..78d910160c4b6a2be02b1060dfbc5a0ec2526bb1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/lib/.gitignore
@@ -0,0 +1,2 @@
+/*
+!.gitignore
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..78d910160c4b6a2be02b1060dfbc5a0ec2526bb1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore
@@ -0,0 +1,2 @@
+/*
+!.gitignore
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7183b1e817325cf7dfccc5f1659524493b4f0ff
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml
@@ -0,0 +1,64 @@
+<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.mvn</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
+				<executions>
+					<execution>
+						<id>copy-resource-one</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/dependencies/target/classes</directory>
+									<includes>
+										<include>META-INF/MANIFEST.MF</include>
+										<include>.classpath</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<!-- 
+	<dependencies>
+		<dependency>
+		    <groupId>org.opendaylight.yangtools</groupId>
+		    <artifactId>yang-parser-api</artifactId>
+		    <version>11.0.5</version>
+		</dependency>		
+	</dependencies>
+	implementation 'org.opendaylight.yangtools:yang-parser-impl:13.0.1'
+    implementation 'org.opendaylight.yangtools:rfc8819-parser-support:13.0.1'
+    implementation 'org.opendaylight.yangtools:yang-data-codec-gson:13.0.1'
+	<dependencies>
+		<dependency>
+		    <groupId>org.opendaylight.yangtools</groupId>
+		    <artifactId>yang-data-codec-gson</artifactId>
+		    <version>13.0.1</version>
+		</dependency>		
+	</dependencies>
+-->
+</project>
\ 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
index 74755f6584ad0277e8e6010b93fb9d84ad1095ee..9ccdf173730ca8f5472878915cf5eb48d932dea0 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.classpath
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.classpath
@@ -1,38 +1,59 @@
 <?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 exported="true" kind="lib" path="libs/antlr4-runtime-4.13.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/checker-qual-3.37.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/concepts-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/error_prone_annotations-2.21.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/failureaccess-1.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/gson-2.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/guava-32.1.3-jre.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/j2objc-annotations-2.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/odlext-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/odlext-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/openconfig-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/openconfig-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/org.eclipse.jdt.annotation-2.2.800.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc6241-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc6241-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc6536-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc6536-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc6643-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc6643-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc7952-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc7952-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8040-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8040-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8528-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8528-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8639-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8639-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8819-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/rfc8819-parser-support-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/triemap-1.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/util-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/value-2.10.0-annotations.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-common-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-codec-gson-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-impl-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-spi-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-util-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-ir-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-model-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-model-ri-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-model-spi-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-model-util-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-parser-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-parser-impl-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-parser-reactor-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-parser-rfc7950-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-parser-spi-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-repo-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-repo-spi-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-xpath-api-13.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/yang-xpath-impl-13.0.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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
index f2e6621d9486fab0c2f1a55fd500d05c28a88104..27b847dc01b2d645a074c4474dc0919b4a1637ff 100644
--- 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
@@ -3,8 +3,13 @@ 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,
+Export-Package: org.opendaylight.yangtools.concepts,
+ org.opendaylight.yangtools.odlext.parser,
  org.opendaylight.yangtools.yang.common,
+ org.opendaylight.yangtools.yang.data.api.schema,
+ org.opendaylight.yangtools.yang.data.api.schema.stream,
+ org.opendaylight.yangtools.yang.data.codec.gson,
+ org.opendaylight.yangtools.yang.data.spi.node,
  org.opendaylight.yangtools.yang.model.api,
  org.opendaylight.yangtools.yang.model.api.meta,
  org.opendaylight.yangtools.yang.model.api.stmt,
@@ -14,6 +19,9 @@ Export-Package: org.opendaylight.yangtools.odlext.parser,
  org.opendaylight.yangtools.yang.model.ri.type,
  org.opendaylight.yangtools.yang.model.spi,
  org.opendaylight.yangtools.yang.model.spi.meta,
+ org.opendaylight.yangtools.yang.model.spi.source,
+ org.opendaylight.yangtools.yang.model.util,
+ org.opendaylight.yangtools.yang.xpath.api,
  org.opendaylight.yangtools.yang.parser.api,
  org.opendaylight.yangtools.yang.parser.rfc7950.reactor,
  org.opendaylight.yangtools.yang.parser.rfc7950.repo,
@@ -21,36 +29,57 @@ Export-Package: org.opendaylight.yangtools.odlext.parser,
  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
+Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper
+Bundle-ClassPath: libs/antlr4-runtime-4.13.1.jar,
+ libs/checker-qual-3.37.0.jar,
+ libs/concepts-13.0.1.jar,
+ libs/error_prone_annotations-2.21.1.jar,
+ libs/failureaccess-1.0.1.jar,
+ libs/gson-2.10.1.jar,
+ libs/guava-32.1.3-jre.jar,
+ libs/j2objc-annotations-2.8.jar,
+ libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,
+ libs/odlext-model-api-13.0.1.jar,
+ libs/odlext-parser-support-13.0.1.jar,
+ libs/openconfig-model-api-13.0.1.jar,
+ libs/openconfig-parser-support-13.0.1.jar,
+ libs/org.eclipse.jdt.annotation-2.2.800.jar,
+ libs/rfc6241-model-api-13.0.1.jar,
+ libs/rfc6241-parser-support-13.0.1.jar,
+ libs/rfc6536-model-api-13.0.1.jar,
+ libs/rfc6536-parser-support-13.0.1.jar,
+ libs/rfc6643-model-api-13.0.1.jar,
+ libs/rfc6643-parser-support-13.0.1.jar,
+ libs/rfc7952-model-api-13.0.1.jar,
+ libs/rfc7952-parser-support-13.0.1.jar,
+ libs/rfc8040-model-api-13.0.1.jar,
+ libs/rfc8040-parser-support-13.0.1.jar,
+ libs/rfc8528-model-api-13.0.1.jar,
+ libs/rfc8528-parser-support-13.0.1.jar,
+ libs/rfc8639-model-api-13.0.1.jar,
+ libs/rfc8639-parser-support-13.0.1.jar,
+ libs/rfc8819-model-api-13.0.1.jar,
+ libs/rfc8819-parser-support-13.0.1.jar,
+ libs/triemap-1.3.1.jar,
+ libs/util-13.0.1.jar,
+ libs/value-2.10.0-annotations.jar,
+ libs/yang-common-13.0.1.jar,
+ libs/yang-data-api-13.0.1.jar,
+ libs/yang-data-codec-gson-13.0.1.jar,
+ libs/yang-data-impl-13.0.1.jar,
+ libs/yang-data-spi-13.0.1.jar,
+ libs/yang-data-util-13.0.1.jar,
+ libs/yang-ir-13.0.1.jar,
+ libs/yang-model-api-13.0.1.jar,
+ libs/yang-model-ri-13.0.1.jar,
+ libs/yang-model-spi-13.0.1.jar,
+ libs/yang-model-util-13.0.1.jar,
+ libs/yang-parser-api-13.0.1.jar,
+ libs/yang-parser-impl-13.0.1.jar,
+ libs/yang-parser-reactor-13.0.1.jar,
+ libs/yang-parser-rfc7950-13.0.1.jar,
+ libs/yang-parser-spi-13.0.1.jar,
+ libs/yang-repo-api-13.0.1.jar,
+ libs/yang-repo-spi-13.0.1.jar,
+ libs/yang-xpath-api-13.0.1.jar,
+ libs/yang-xpath-impl-13.0.1.jar
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
index c6350436c6ed1ba95f9f6a4e3803f30af639ed48..24224f01aaa86e7899f2ee48805657bf2d80dafc 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/README.md
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/README.md
@@ -1,3 +1,11 @@
 # 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
+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.
+
+The dependencies are specified and fetched from Maven in the nested dependencies folder, then copied to the libs folder. The MANIFEST.MF and .classpath files are updated accordingly as part of the build. 
+
+Note: Offline builds run fine. When loading the project in Eclipse it seems to require that the .classpath is set to export all the jars. When installing the plugin from the repository, it still cannot be referenced correctly it seems. 
+
+TODO: Check what is missing.
+
+TODO: Explore using Maven artifacts as part of the target platform? 
\ 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
index 5e583bef6e838eeef37e83280569b85987726bbf..54c09fc44f212d17a00d0b22c405bd4dd35c7564 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/build.properties
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/build.properties
@@ -1,2 +1,2 @@
 bin.includes = META-INF/,\
-               lib/
+               libs/
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/antlr4-runtime-4.13.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/antlr4-runtime-4.13.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..cff419831e85dfcc8ab2fb00b209f76ec0ffa916
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/antlr4-runtime-4.13.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/checker-qual-3.37.0.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/checker-qual-3.37.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b4f9db98c3f24dcb568b0da2f362627d713c2ffa
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/checker-qual-3.37.0.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/concepts-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/concepts-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9a9aef107c401a58a0aa6d609d112965b33f0ad4
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/concepts-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/error_prone_annotations-2.21.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/error_prone_annotations-2.21.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..00f26ae100675924ecae5f6eac1d6f6f38c3b2c0
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/error_prone_annotations-2.21.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/failureaccess-1.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/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/libs/failureaccess-1.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/gson-2.10.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/gson-2.10.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a88c5bd9b5f17af70ab9601a781388418e0b772f
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/gson-2.10.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/guava-32.1.3-jre.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/guava-32.1.3-jre.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9dc82354770d35604725ae5be5bcd6e7fb1ce84e
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/guava-32.1.3-jre.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/j2objc-annotations-2.8.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/j2objc-annotations-2.8.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3595c4f9be5c0ce779f8dd611e7f6917ca518f5d
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/j2objc-annotations-2.8.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/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/libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/odlext-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/odlext-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d738e8c6d6e82f837f8d3a3eac1e9c0509aa0a22
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/odlext-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/odlext-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/odlext-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..23a286fc779c72f5922f47d69a58d60040bdbac2
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/odlext-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/openconfig-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/openconfig-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..22b9509715b985388c6f4baab94dd2ee31b01b8d
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/openconfig-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/openconfig-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/openconfig-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0262f2d79647cba10a40ede82ab868f2476e4d4a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/openconfig-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/org.eclipse.jdt.annotation-2.2.800.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/org.eclipse.jdt.annotation-2.2.800.jar
new file mode 100644
index 0000000000000000000000000000000000000000..63b2fc935ae025cf3a01dfda15d371ec15d2e256
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/org.eclipse.jdt.annotation-2.2.800.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6241-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6241-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ca4b563f15fcd7de2e4ce595b125a7e342a3fcc2
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6241-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6241-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6241-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..56d422911eae9821c335365fed1119626f6045ec
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6241-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6536-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6536-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..347ca785f0658736904c59b1621c1de07057b28a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6536-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6536-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6536-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a4b4306ffc5fa09d0f56bb9c6cab8f7d48a80269
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6536-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6643-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6643-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5bacc675097886308e6f238eb5018f25b1efc851
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6643-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6643-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6643-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..959dd14b5785f5e50540de27cd4c167375a2fc19
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc6643-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc7952-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc7952-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c16034733b999d9f7f9195dc742e812d80f057b2
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc7952-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc7952-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc7952-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1169dc474be3ec4f87f45d1bfc66262b365f045c
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc7952-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8040-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8040-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..65acaad17723b332fd7b02665ee9e8516aa3ec02
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8040-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8040-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8040-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9500eb82b2dfbe07e2d66f3db072d2f7ee55ca47
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8040-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8528-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8528-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8adcd45401e0ed483ee76365b397755ce8eff652
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8528-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8528-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8528-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d05971c441c7639ed34288ddbf3540d9bc037393
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8528-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8639-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8639-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d2eeda752ae9445452fdbab4131390df1b36eda9
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8639-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8639-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8639-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e8f5f72f6a10c6eedd8a86e422be55c09a0b4ece
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8639-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8819-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8819-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3f7a016ef9dd36604f6a990a1ec355e4f3750a0f
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8819-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8819-parser-support-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8819-parser-support-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6a4344f809a7fde217dee7f6c28f0cbf78dfc340
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/rfc8819-parser-support-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/triemap-1.3.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/triemap-1.3.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2d6a17a15599f7af82f14b589e13386b6bfa145a
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/triemap-1.3.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/util-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/util-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..32f07a75e2e45daa68098fb5bc1c57bb22871cc4
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/util-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/value-2.10.0-annotations.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/value-2.10.0-annotations.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1961fe4538b9c2c522a261b83b95b087d1de4656
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/value-2.10.0-annotations.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-common-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-common-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..99a86e9a7ba36ff370929976f84f5c0c837ab3bb
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-common-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7cd9bb86bb5d984c9ed849f0f26c4aec152e77a4
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-codec-gson-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-codec-gson-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..04a51e4c985a95df69b468f3ae38138d41a07ea8
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-codec-gson-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-impl-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-impl-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9e94e35abf380221d0515a9a9decf96908241ff1
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-impl-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-spi-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-spi-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b94288e626e208791611c0c38336d96f7074caaf
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-spi-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-util-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-util-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..56c90450e243420b98dadd37328716fec27c1fec
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-data-util-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-ir-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-ir-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..fdda260fdaacb978e423031e9dff1ddbae62c2f3
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-ir-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1c27674d7118a98391d646701d54fe127f8547dc
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-ri-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-ri-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..962e88f72d5f75b01f403054fd31166efb242090
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-ri-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-spi-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-spi-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f4dfb84bf9bb137a6bf70173210918b3fc9622c1
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-spi-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-util-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-util-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1f384d31afc8e69f2e6a86b371de39766e2c03dd
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-model-util-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..62cc700578abe120949a30dfd551090502d7053f
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-impl-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-impl-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e2fdec69394d21bd75d589143816a938c9633ff8
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-impl-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-reactor-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-reactor-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1d0ef5526c3d4d5d955c73cf518c4203bede0e1b
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-reactor-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-rfc7950-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-rfc7950-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0c4e517e4526ad6358d13eddde91f36fc2535af5
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-rfc7950-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-spi-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-spi-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f7af1c89f7000a803435f0ebd12fce2e908cefdc
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-parser-spi-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-repo-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-repo-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e508f881b98089ce34be973f02ec2b3a41ccb273
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-repo-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-repo-spi-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-repo-spi-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a2ba1464f4f4768534066387e03baa9e6ac2e991
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-repo-spi-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-xpath-api-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-xpath-api-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..79d20f9abb2bf1760f8ab7db96fea123d422cb82
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-xpath-api-13.0.1.jar differ
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-xpath-impl-13.0.1.jar b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-xpath-impl-13.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4e9a41447794d27fddab220b8cf8aec0e40c49ff
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/yang-xpath-impl-13.0.1.jar differ