diff --git a/VERSION b/VERSION
index 9cc792d..205460e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-2.1.34
+2.1.35
 
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index 1c9b130..cb13124 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/chameleon
-FROM xosproject/xos-base:2.1.34
+FROM xosproject/xos-base:2.1.35
 
 # xos-base already has protoc and dependencies installed
 
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index 7ee9bae..c8bdeef 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-client
-FROM xosproject/xos-libraries:2.1.34
+FROM xosproject/xos-libraries:2.1.35
 
 # Install XOS client
 COPY lib/xos-api /tmp/xos-api
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index 3a8a6a0..ac83f28 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-libraries
-FROM xosproject/xos-base:2.1.34
+FROM xosproject/xos-base:2.1.35
 
 # Add libraries
 COPY lib /opt/xos/lib
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index 1458e7e..3fa14f5 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:2.1.34
+FROM xosproject/xos-client:2.1.35
 
 COPY xos/synchronizers/new_base /opt/xos/synchronizers/new_base
 COPY xos/xos/logger.py /opt/xos/xos/logger.py
diff --git a/containers/xos/Dockerfile.xos-core b/containers/xos/Dockerfile.xos-core
index 8326199..a8f70a8 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-core
-FROM xosproject/xos-libraries:2.1.34
+FROM xosproject/xos-libraries:2.1.35
 
 # Install XOS
 ADD xos /opt/xos
diff --git a/xos/coreapi/dynamicbuild.py b/xos/coreapi/dynamicbuild.py
index 1c8e4f6..1de6b9e 100644
--- a/xos/coreapi/dynamicbuild.py
+++ b/xos/coreapi/dynamicbuild.py
@@ -39,7 +39,7 @@
         self.protos_dir = os.path.join(base_dir, "coreapi/protos")
         self.app_metadata_dir = os.path.join(base_dir, "xos")
         self.convenience_methods_dir = os.path.join(
-            base_dir, "xos_client/xosapi/convenience"
+            base_dir, "dynamic_services/convenience_methods"
         )
 
     def pre_validate_file(self, item):
@@ -182,6 +182,9 @@
         if not os.path.exists(self.manifest_dir):
             os.makedirs(self.manifest_dir)
 
+        if not os.path.exists(self.convenience_methods_dir):
+            os.makedirs(self.convenience_methods_dir)
+
         manifest_fn = os.path.join(self.manifest_dir, request.name + ".json")
 
         # Invariant is that if a manifest file exists, then it accurately reflects that has been stored to disk. Since