diff --git a/features/org.etsi.mts.tdl.extras.feature/feature.xml b/features/org.etsi.mts.tdl.extras.feature/feature.xml
index 6c7369ee47ca313a4aa197dd4769d887db125049..4aba6f288f30b9856e625ebddebf1c8efa5485fc 100644
--- a/features/org.etsi.mts.tdl.extras.feature/feature.xml
+++ b/features/org.etsi.mts.tdl.extras.feature/feature.xml
@@ -314,17 +314,26 @@ 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"/>
+
    <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 01007af920ae2eb3cb0f8663d343598476a4a3c5..018e747915512cde881d5119d71d745a04fe6668 100644
--- a/org.etsi.mts.tdl.extras.parent/pom.xml
+++ b/org.etsi.mts.tdl.extras.parent/pom.xml
@@ -14,6 +14,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<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