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
index 43c86a32ddd6a4f03e5748de27ba2ac8c6f2bf6c..ea8cf5235ceeace592b782a80a164eb04d3b904c 100644
--- 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
@@ -3,8 +3,13 @@ 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.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,
@@ -58,5 +66,20 @@ Bundle-Classpath: libs/yang-data-codec-gson-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/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
 Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties
index ac273f2e3580ac454bdf79d858a1b7831a9f376d..7cf7b00a6bc8758ab9592214f10b4098f2635cb8 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties
@@ -1 +1 @@
-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-repo-api-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
\ No newline at end of file
+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-repo-api-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
\ No newline at end of file
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
index fd29fc116438d9bbea435626241cdf52a3e07465..9d837f4bb8bd70761543837452bf97a8c9816463 100644
--- 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
@@ -160,5 +160,10 @@
 			<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>
 	</dependencies>
 </project>
\ No newline at end of file
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
index 0be6905e394f7f19cf7c2005329cf4b75c984f86..e28c86a0f3c3fde3ad62f249707d0d0487065864 100644
--- 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
@@ -3,8 +3,13 @@ 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.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,