diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/client/NiFiRegistryClientFactory.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/client/NiFiRegistryClientFactory.java
index a8d1608329..bdc2535043 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/client/NiFiRegistryClientFactory.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/client/NiFiRegistryClientFactory.java
@@ -19,6 +19,10 @@ package org.apache.nifi.toolkit.cli.impl.client;
 import org.apache.commons.cli.MissingOptionException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.nifi.registry.client.BucketClient;
+import org.apache.nifi.registry.client.BundleClient;
+import org.apache.nifi.registry.client.BundleVersionClient;
+import org.apache.nifi.registry.client.ExtensionClient;
+import org.apache.nifi.registry.client.ExtensionRepoClient;
 import org.apache.nifi.registry.client.FlowClient;
 import org.apache.nifi.registry.client.FlowSnapshotClient;
 import org.apache.nifi.registry.client.ItemsClient;
@@ -167,6 +171,46 @@ public class NiFiRegistryClientFactory implements ClientFactory<NiFiRegistryClie
             return client.getUserClient(proxiedEntity);
         }
 
+        @Override
+        public BundleClient getBundleClient() {
+            return getBundleClient(proxiedEntity);
+        }
+
+        @Override
+        public BundleClient getBundleClient(String... proxiedEntity) {
+            return client.getBundleClient(proxiedEntity);
+        }
+
+        @Override
+        public BundleVersionClient getBundleVersionClient() {
+            return getBundleVersionClient(proxiedEntity);
+        }
+
+        @Override
+        public BundleVersionClient getBundleVersionClient(String... proxiedEntity) {
+            return client.getBundleVersionClient(proxiedEntity);
+        }
+
+        @Override
+        public ExtensionRepoClient getExtensionRepoClient() {
+            return getExtensionRepoClient(proxiedEntity);
+        }
+
+        @Override
+        public ExtensionRepoClient getExtensionRepoClient(String... proxiedEntity) {
+            return client.getExtensionRepoClient(proxiedEntity);
+        }
+
+        @Override
+        public ExtensionClient getExtensionClient() {
+            return getExtensionClient(proxiedEntity);
+        }
+
+        @Override
+        public ExtensionClient getExtensionClient(String... proxiedEntity) {
+            return client.getExtensionClient(proxiedEntity);
+        }
+
         @Override
         public void close() throws IOException {
             client.close();
diff --git a/pom.xml b/pom.xml
index cafc20a729..01864eadac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
         <ranger.version>1.0.0</ranger.version>
         <jetty.version>9.4.15.v20190215</jetty.version>
         <jackson.version>2.9.8</jackson.version>
-        <nifi.registry.version>0.3.0</nifi.registry.version>
+        <nifi.registry.version>0.4.0</nifi.registry.version>
     </properties>
 
     <repositories>