diff --git a/docs/cluster/cluster.html b/docs/cluster/cluster.html
index 7b391787d..e33b9cc2f 100644
--- a/docs/cluster/cluster.html
+++ b/docs/cluster/cluster.html
@@ -102,7 +102,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         self.config = config
         self.app_wrapper_yaml = self.create_app_wrapper()
         self.app_wrapper_name = self.app_wrapper_yaml.split(&#34;.&#34;)[0]
-        self._client = None
+        self._job_submission_client = None
 
     @property
     def _client_headers(self):
@@ -118,23 +118,25 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         return not self.config.openshift_oauth
 
     @property
-    def client(self):
-        if self._client:
-            return self._client
+    def job_client(self):
+        if self._job_submission_client:
+            return self._job_submission_client
         if self.config.openshift_oauth:
             print(
                 api_config_handler().configuration.get_api_key_with_prefix(
                     &#34;authorization&#34;
                 )
             )
-            self._client = JobSubmissionClient(
+            self._job_submission_client = JobSubmissionClient(
                 self.cluster_dashboard_uri(),
                 headers=self._client_headers,
                 verify=self._client_verify_tls,
             )
         else:
-            self._client = JobSubmissionClient(self.cluster_dashboard_uri())
-        return self._client
+            self._job_submission_client = JobSubmissionClient(
+                self.cluster_dashboard_uri()
+            )
+        return self._job_submission_client
 
     def evaluate_dispatch_priority(self):
         priority_class = self.config.dispatch_priority
@@ -173,6 +175,10 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
 
         # Before attempting to create the cluster AW, let&#39;s evaluate the ClusterConfig
         if self.config.dispatch_priority:
+            if not self.config.mcad:
+                raise ValueError(
+                    &#34;Invalid Cluster Configuration, cannot have dispatch priority without MCAD&#34;
+                )
             priority_val = self.evaluate_dispatch_priority()
             if priority_val == None:
                 raise ValueError(
@@ -195,6 +201,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         template = self.config.template
         image = self.config.image
         instascale = self.config.instascale
+        mcad = self.config.mcad
         instance_types = self.config.machine_types
         env = self.config.envs
         local_interactive = self.config.local_interactive
@@ -215,6 +222,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
             template=template,
             image=image,
             instascale=instascale,
+            mcad=mcad,
             instance_types=instance_types,
             env=env,
             local_interactive=local_interactive,
@@ -239,15 +247,18 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         try:
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
-            with open(self.app_wrapper_yaml) as f:
-                aw = yaml.load(f, Loader=yaml.FullLoader)
-            api_instance.create_namespaced_custom_object(
-                group=&#34;workload.codeflare.dev&#34;,
-                version=&#34;v1beta1&#34;,
-                namespace=namespace,
-                plural=&#34;appwrappers&#34;,
-                body=aw,
-            )
+            if self.config.mcad:
+                with open(self.app_wrapper_yaml) as f:
+                    aw = yaml.load(f, Loader=yaml.FullLoader)
+                api_instance.create_namespaced_custom_object(
+                    group=&#34;workload.codeflare.dev&#34;,
+                    version=&#34;v1beta1&#34;,
+                    namespace=namespace,
+                    plural=&#34;appwrappers&#34;,
+                    body=aw,
+                )
+            else:
+                self._component_resources_up(namespace, api_instance)
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
@@ -260,13 +271,16 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         try:
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
-            api_instance.delete_namespaced_custom_object(
-                group=&#34;workload.codeflare.dev&#34;,
-                version=&#34;v1beta1&#34;,
-                namespace=namespace,
-                plural=&#34;appwrappers&#34;,
-                name=self.app_wrapper_name,
-            )
+            if self.config.mcad:
+                api_instance.delete_namespaced_custom_object(
+                    group=&#34;workload.codeflare.dev&#34;,
+                    version=&#34;v1beta1&#34;,
+                    namespace=namespace,
+                    plural=&#34;appwrappers&#34;,
+                    name=self.app_wrapper_name,
+                )
+            else:
+                self._component_resources_down(namespace, api_instance)
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
@@ -284,42 +298,46 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         &#34;&#34;&#34;
         ready = False
         status = CodeFlareClusterStatus.UNKNOWN
-        # check the app wrapper status
-        appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
-        if appwrapper:
-            if appwrapper.status in [
-                AppWrapperStatus.RUNNING,
-                AppWrapperStatus.COMPLETED,
-                AppWrapperStatus.RUNNING_HOLD_COMPLETION,
-            ]:
-                ready = False
-                status = CodeFlareClusterStatus.STARTING
-            elif appwrapper.status in [
-                AppWrapperStatus.FAILED,
-                AppWrapperStatus.DELETED,
-            ]:
-                ready = False
-                status = CodeFlareClusterStatus.FAILED  # should deleted be separate
-                return status, ready  # exit early, no need to check ray status
-            elif appwrapper.status in [
-                AppWrapperStatus.PENDING,
-                AppWrapperStatus.QUEUEING,
-            ]:
-                ready = False
-                if appwrapper.status == AppWrapperStatus.PENDING:
-                    status = CodeFlareClusterStatus.QUEUED
-                else:
-                    status = CodeFlareClusterStatus.QUEUEING
-                if print_to_console:
-                    pretty_print.print_app_wrappers_status([appwrapper])
-                return (
-                    status,
-                    ready,
-                )  # no need to check the ray status since still in queue
+        if self.config.mcad:
+            # check the app wrapper status
+            appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
+            if appwrapper:
+                if appwrapper.status in [
+                    AppWrapperStatus.RUNNING,
+                    AppWrapperStatus.COMPLETED,
+                    AppWrapperStatus.RUNNING_HOLD_COMPLETION,
+                ]:
+                    ready = False
+                    status = CodeFlareClusterStatus.STARTING
+                elif appwrapper.status in [
+                    AppWrapperStatus.FAILED,
+                    AppWrapperStatus.DELETED,
+                ]:
+                    ready = False
+                    status = CodeFlareClusterStatus.FAILED  # should deleted be separate
+                    return status, ready  # exit early, no need to check ray status
+                elif appwrapper.status in [
+                    AppWrapperStatus.PENDING,
+                    AppWrapperStatus.QUEUEING,
+                ]:
+                    ready = False
+                    if appwrapper.status == AppWrapperStatus.PENDING:
+                        status = CodeFlareClusterStatus.QUEUED
+                    else:
+                        status = CodeFlareClusterStatus.QUEUEING
+                    if print_to_console:
+                        pretty_print.print_app_wrappers_status([appwrapper])
+                    return (
+                        status,
+                        ready,
+                    )  # no need to check the ray status since still in queue
 
         # check the ray cluster status
         cluster = _ray_cluster_status(self.config.name, self.config.namespace)
-        if cluster and not cluster.status == RayClusterStatus.UNKNOWN:
+        if cluster:
+            if cluster.status == RayClusterStatus.UNKNOWN:
+                ready = False
+                status = CodeFlareClusterStatus.STARTING
             if cluster.status == RayClusterStatus.READY:
                 ready = True
                 status = CodeFlareClusterStatus.READY
@@ -439,19 +457,19 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         &#34;&#34;&#34;
         This method accesses the head ray node in your cluster and lists the running jobs.
         &#34;&#34;&#34;
-        return self.client.list_jobs()
+        return self.job_client.list_jobs()
 
     def job_status(self, job_id: str) -&gt; str:
         &#34;&#34;&#34;
         This method accesses the head ray node in your cluster and returns the job status for the provided job id.
         &#34;&#34;&#34;
-        return self.client.get_job_status(job_id)
+        return self.job_client.get_job_status(job_id)
 
     def job_logs(self, job_id: str) -&gt; str:
         &#34;&#34;&#34;
         This method accesses the head ray node in your cluster and returns the logs for the provided job id.
         &#34;&#34;&#34;
-        return self.client.get_job_logs(job_id)
+        return self.job_client.get_job_logs(job_id)
 
     def torchx_config(
         self, working_dir: str = None, requirements: str = None
@@ -467,7 +485,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
             to_return[&#34;requirements&#34;] = requirements
         return to_return
 
-    def from_k8_cluster_object(rc):
+    def from_k8_cluster_object(rc, mcad=True):
         machine_types = (
             rc[&#34;metadata&#34;][&#34;labels&#34;][&#34;orderedinstance&#34;].split(&#34;_&#34;)
             if &#34;orderedinstance&#34; in rc[&#34;metadata&#34;][&#34;labels&#34;]
@@ -506,6 +524,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
                 0
             ][&#34;image&#34;],
             local_interactive=local_interactive,
+            mcad=mcad,
         )
         return Cluster(cluster_config)
 
@@ -516,6 +535,66 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
         else:
             return &#34;None&#34;
 
+    def _component_resources_up(
+        self, namespace: str, api_instance: client.CustomObjectsApi
+    ):
+        with open(self.app_wrapper_yaml) as f:
+            yamls = yaml.load_all(f, Loader=yaml.FullLoader)
+            for resource in yamls:
+                if resource[&#34;kind&#34;] == &#34;RayCluster&#34;:
+                    api_instance.create_namespaced_custom_object(
+                        group=&#34;ray.io&#34;,
+                        version=&#34;v1alpha1&#34;,
+                        namespace=namespace,
+                        plural=&#34;rayclusters&#34;,
+                        body=resource,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Route&#34;:
+                    api_instance.create_namespaced_custom_object(
+                        group=&#34;route.openshift.io&#34;,
+                        version=&#34;v1&#34;,
+                        namespace=namespace,
+                        plural=&#34;routes&#34;,
+                        body=resource,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Secret&#34;:
+                    secret_instance = client.CoreV1Api(api_config_handler())
+                    secret_instance.create_namespaced_secret(
+                        namespace=namespace,
+                        body=resource,
+                    )
+
+    def _component_resources_down(
+        self, namespace: str, api_instance: client.CustomObjectsApi
+    ):
+        with open(self.app_wrapper_yaml) as f:
+            yamls = yaml.load_all(f, Loader=yaml.FullLoader)
+            for resource in yamls:
+                if resource[&#34;kind&#34;] == &#34;RayCluster&#34;:
+                    api_instance.delete_namespaced_custom_object(
+                        group=&#34;ray.io&#34;,
+                        version=&#34;v1alpha1&#34;,
+                        namespace=namespace,
+                        plural=&#34;rayclusters&#34;,
+                        name=self.app_wrapper_name,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Route&#34;:
+                    name = resource[&#34;metadata&#34;][&#34;name&#34;]
+                    api_instance.delete_namespaced_custom_object(
+                        group=&#34;route.openshift.io&#34;,
+                        version=&#34;v1&#34;,
+                        namespace=namespace,
+                        plural=&#34;routes&#34;,
+                        name=name,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Secret&#34;:
+                    name = resource[&#34;metadata&#34;][&#34;name&#34;]
+                    secret_instance = client.CoreV1Api(api_config_handler())
+                    secret_instance.delete_namespaced_secret(
+                        namespace=namespace,
+                        name=name,
+                    )
+
 
 def list_all_clusters(namespace: str, print_to_console: bool = True):
     &#34;&#34;&#34;
@@ -581,13 +660,33 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
 
     for rc in rcs[&#34;items&#34;]:
         if rc[&#34;metadata&#34;][&#34;name&#34;] == cluster_name:
-            return Cluster.from_k8_cluster_object(rc)
+            mcad = _check_aw_exists(cluster_name, namespace)
+            return Cluster.from_k8_cluster_object(rc, mcad=mcad)
     raise FileNotFoundError(
         f&#34;Cluster {cluster_name} is not found in {namespace} namespace&#34;
     )
 
 
 # private methods
+def _check_aw_exists(name: str, namespace: str) -&gt; bool:
+    try:
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
+        aws = api_instance.list_namespaced_custom_object(
+            group=&#34;workload.codeflare.dev&#34;,
+            version=&#34;v1beta1&#34;,
+            namespace=namespace,
+            plural=&#34;appwrappers&#34;,
+        )
+    except Exception as e:  # pragma: no cover
+        return _kube_api_error_handling(e, print_error=False)
+
+    for aw in aws[&#34;items&#34;]:
+        if aw[&#34;metadata&#34;][&#34;name&#34;] == name:
+            return True
+    return False
+
+
 def _get_ingress_domain():
     try:
         config_check()
@@ -692,6 +791,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
 
     config_check()
     api_instance = client.CustomObjectsApi(api_config_handler())
+    # UPDATE THIS
     routes = api_instance.list_namespaced_custom_object(
         group=&#34;route.openshift.io&#34;,
         version=&#34;v1&#34;,
@@ -806,7 +906,8 @@ <h2 class="section-title" id="header-functions">Functions</h2>
 
     for rc in rcs[&#34;items&#34;]:
         if rc[&#34;metadata&#34;][&#34;name&#34;] == cluster_name:
-            return Cluster.from_k8_cluster_object(rc)
+            mcad = _check_aw_exists(cluster_name, namespace)
+            return Cluster.from_k8_cluster_object(rc, mcad=mcad)
     raise FileNotFoundError(
         f&#34;Cluster {cluster_name} is not found in {namespace} namespace&#34;
     )</code></pre>
@@ -930,7 +1031,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         self.config = config
         self.app_wrapper_yaml = self.create_app_wrapper()
         self.app_wrapper_name = self.app_wrapper_yaml.split(&#34;.&#34;)[0]
-        self._client = None
+        self._job_submission_client = None
 
     @property
     def _client_headers(self):
@@ -946,23 +1047,25 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         return not self.config.openshift_oauth
 
     @property
-    def client(self):
-        if self._client:
-            return self._client
+    def job_client(self):
+        if self._job_submission_client:
+            return self._job_submission_client
         if self.config.openshift_oauth:
             print(
                 api_config_handler().configuration.get_api_key_with_prefix(
                     &#34;authorization&#34;
                 )
             )
-            self._client = JobSubmissionClient(
+            self._job_submission_client = JobSubmissionClient(
                 self.cluster_dashboard_uri(),
                 headers=self._client_headers,
                 verify=self._client_verify_tls,
             )
         else:
-            self._client = JobSubmissionClient(self.cluster_dashboard_uri())
-        return self._client
+            self._job_submission_client = JobSubmissionClient(
+                self.cluster_dashboard_uri()
+            )
+        return self._job_submission_client
 
     def evaluate_dispatch_priority(self):
         priority_class = self.config.dispatch_priority
@@ -1001,6 +1104,10 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 
         # Before attempting to create the cluster AW, let&#39;s evaluate the ClusterConfig
         if self.config.dispatch_priority:
+            if not self.config.mcad:
+                raise ValueError(
+                    &#34;Invalid Cluster Configuration, cannot have dispatch priority without MCAD&#34;
+                )
             priority_val = self.evaluate_dispatch_priority()
             if priority_val == None:
                 raise ValueError(
@@ -1023,6 +1130,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         template = self.config.template
         image = self.config.image
         instascale = self.config.instascale
+        mcad = self.config.mcad
         instance_types = self.config.machine_types
         env = self.config.envs
         local_interactive = self.config.local_interactive
@@ -1043,6 +1151,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
             template=template,
             image=image,
             instascale=instascale,
+            mcad=mcad,
             instance_types=instance_types,
             env=env,
             local_interactive=local_interactive,
@@ -1067,15 +1176,18 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         try:
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
-            with open(self.app_wrapper_yaml) as f:
-                aw = yaml.load(f, Loader=yaml.FullLoader)
-            api_instance.create_namespaced_custom_object(
-                group=&#34;workload.codeflare.dev&#34;,
-                version=&#34;v1beta1&#34;,
-                namespace=namespace,
-                plural=&#34;appwrappers&#34;,
-                body=aw,
-            )
+            if self.config.mcad:
+                with open(self.app_wrapper_yaml) as f:
+                    aw = yaml.load(f, Loader=yaml.FullLoader)
+                api_instance.create_namespaced_custom_object(
+                    group=&#34;workload.codeflare.dev&#34;,
+                    version=&#34;v1beta1&#34;,
+                    namespace=namespace,
+                    plural=&#34;appwrappers&#34;,
+                    body=aw,
+                )
+            else:
+                self._component_resources_up(namespace, api_instance)
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
@@ -1088,13 +1200,16 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         try:
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
-            api_instance.delete_namespaced_custom_object(
-                group=&#34;workload.codeflare.dev&#34;,
-                version=&#34;v1beta1&#34;,
-                namespace=namespace,
-                plural=&#34;appwrappers&#34;,
-                name=self.app_wrapper_name,
-            )
+            if self.config.mcad:
+                api_instance.delete_namespaced_custom_object(
+                    group=&#34;workload.codeflare.dev&#34;,
+                    version=&#34;v1beta1&#34;,
+                    namespace=namespace,
+                    plural=&#34;appwrappers&#34;,
+                    name=self.app_wrapper_name,
+                )
+            else:
+                self._component_resources_down(namespace, api_instance)
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
@@ -1112,42 +1227,46 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         &#34;&#34;&#34;
         ready = False
         status = CodeFlareClusterStatus.UNKNOWN
-        # check the app wrapper status
-        appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
-        if appwrapper:
-            if appwrapper.status in [
-                AppWrapperStatus.RUNNING,
-                AppWrapperStatus.COMPLETED,
-                AppWrapperStatus.RUNNING_HOLD_COMPLETION,
-            ]:
-                ready = False
-                status = CodeFlareClusterStatus.STARTING
-            elif appwrapper.status in [
-                AppWrapperStatus.FAILED,
-                AppWrapperStatus.DELETED,
-            ]:
-                ready = False
-                status = CodeFlareClusterStatus.FAILED  # should deleted be separate
-                return status, ready  # exit early, no need to check ray status
-            elif appwrapper.status in [
-                AppWrapperStatus.PENDING,
-                AppWrapperStatus.QUEUEING,
-            ]:
-                ready = False
-                if appwrapper.status == AppWrapperStatus.PENDING:
-                    status = CodeFlareClusterStatus.QUEUED
-                else:
-                    status = CodeFlareClusterStatus.QUEUEING
-                if print_to_console:
-                    pretty_print.print_app_wrappers_status([appwrapper])
-                return (
-                    status,
-                    ready,
-                )  # no need to check the ray status since still in queue
+        if self.config.mcad:
+            # check the app wrapper status
+            appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
+            if appwrapper:
+                if appwrapper.status in [
+                    AppWrapperStatus.RUNNING,
+                    AppWrapperStatus.COMPLETED,
+                    AppWrapperStatus.RUNNING_HOLD_COMPLETION,
+                ]:
+                    ready = False
+                    status = CodeFlareClusterStatus.STARTING
+                elif appwrapper.status in [
+                    AppWrapperStatus.FAILED,
+                    AppWrapperStatus.DELETED,
+                ]:
+                    ready = False
+                    status = CodeFlareClusterStatus.FAILED  # should deleted be separate
+                    return status, ready  # exit early, no need to check ray status
+                elif appwrapper.status in [
+                    AppWrapperStatus.PENDING,
+                    AppWrapperStatus.QUEUEING,
+                ]:
+                    ready = False
+                    if appwrapper.status == AppWrapperStatus.PENDING:
+                        status = CodeFlareClusterStatus.QUEUED
+                    else:
+                        status = CodeFlareClusterStatus.QUEUEING
+                    if print_to_console:
+                        pretty_print.print_app_wrappers_status([appwrapper])
+                    return (
+                        status,
+                        ready,
+                    )  # no need to check the ray status since still in queue
 
         # check the ray cluster status
         cluster = _ray_cluster_status(self.config.name, self.config.namespace)
-        if cluster and not cluster.status == RayClusterStatus.UNKNOWN:
+        if cluster:
+            if cluster.status == RayClusterStatus.UNKNOWN:
+                ready = False
+                status = CodeFlareClusterStatus.STARTING
             if cluster.status == RayClusterStatus.READY:
                 ready = True
                 status = CodeFlareClusterStatus.READY
@@ -1267,19 +1386,19 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         &#34;&#34;&#34;
         This method accesses the head ray node in your cluster and lists the running jobs.
         &#34;&#34;&#34;
-        return self.client.list_jobs()
+        return self.job_client.list_jobs()
 
     def job_status(self, job_id: str) -&gt; str:
         &#34;&#34;&#34;
         This method accesses the head ray node in your cluster and returns the job status for the provided job id.
         &#34;&#34;&#34;
-        return self.client.get_job_status(job_id)
+        return self.job_client.get_job_status(job_id)
 
     def job_logs(self, job_id: str) -&gt; str:
         &#34;&#34;&#34;
         This method accesses the head ray node in your cluster and returns the logs for the provided job id.
         &#34;&#34;&#34;
-        return self.client.get_job_logs(job_id)
+        return self.job_client.get_job_logs(job_id)
 
     def torchx_config(
         self, working_dir: str = None, requirements: str = None
@@ -1295,7 +1414,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
             to_return[&#34;requirements&#34;] = requirements
         return to_return
 
-    def from_k8_cluster_object(rc):
+    def from_k8_cluster_object(rc, mcad=True):
         machine_types = (
             rc[&#34;metadata&#34;][&#34;labels&#34;][&#34;orderedinstance&#34;].split(&#34;_&#34;)
             if &#34;orderedinstance&#34; in rc[&#34;metadata&#34;][&#34;labels&#34;]
@@ -1334,6 +1453,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
                 0
             ][&#34;image&#34;],
             local_interactive=local_interactive,
+            mcad=mcad,
         )
         return Cluster(cluster_config)
 
@@ -1342,7 +1462,67 @@ <h2 class="section-title" id="header-classes">Classes</h2>
             ingress_domain = _get_ingress_domain()
             return f&#34;ray://rayclient-{self.config.name}-{self.config.namespace}.{ingress_domain}&#34;
         else:
-            return &#34;None&#34;</code></pre>
+            return &#34;None&#34;
+
+    def _component_resources_up(
+        self, namespace: str, api_instance: client.CustomObjectsApi
+    ):
+        with open(self.app_wrapper_yaml) as f:
+            yamls = yaml.load_all(f, Loader=yaml.FullLoader)
+            for resource in yamls:
+                if resource[&#34;kind&#34;] == &#34;RayCluster&#34;:
+                    api_instance.create_namespaced_custom_object(
+                        group=&#34;ray.io&#34;,
+                        version=&#34;v1alpha1&#34;,
+                        namespace=namespace,
+                        plural=&#34;rayclusters&#34;,
+                        body=resource,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Route&#34;:
+                    api_instance.create_namespaced_custom_object(
+                        group=&#34;route.openshift.io&#34;,
+                        version=&#34;v1&#34;,
+                        namespace=namespace,
+                        plural=&#34;routes&#34;,
+                        body=resource,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Secret&#34;:
+                    secret_instance = client.CoreV1Api(api_config_handler())
+                    secret_instance.create_namespaced_secret(
+                        namespace=namespace,
+                        body=resource,
+                    )
+
+    def _component_resources_down(
+        self, namespace: str, api_instance: client.CustomObjectsApi
+    ):
+        with open(self.app_wrapper_yaml) as f:
+            yamls = yaml.load_all(f, Loader=yaml.FullLoader)
+            for resource in yamls:
+                if resource[&#34;kind&#34;] == &#34;RayCluster&#34;:
+                    api_instance.delete_namespaced_custom_object(
+                        group=&#34;ray.io&#34;,
+                        version=&#34;v1alpha1&#34;,
+                        namespace=namespace,
+                        plural=&#34;rayclusters&#34;,
+                        name=self.app_wrapper_name,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Route&#34;:
+                    name = resource[&#34;metadata&#34;][&#34;name&#34;]
+                    api_instance.delete_namespaced_custom_object(
+                        group=&#34;route.openshift.io&#34;,
+                        version=&#34;v1&#34;,
+                        namespace=namespace,
+                        plural=&#34;routes&#34;,
+                        name=name,
+                    )
+                elif resource[&#34;kind&#34;] == &#34;Secret&#34;:
+                    name = resource[&#34;metadata&#34;][&#34;name&#34;]
+                    secret_instance = client.CoreV1Api(api_config_handler())
+                    secret_instance.delete_namespaced_secret(
+                        namespace=namespace,
+                        name=name,
+                    )</code></pre>
 </details>
 <h3>Class variables</h3>
 <dl>
@@ -1353,7 +1533,7 @@ <h3>Class variables</h3>
 </dl>
 <h3>Instance variables</h3>
 <dl>
-<dt id="codeflare_sdk.cluster.cluster.Cluster.client"><code class="name">var <span class="ident">client</span></code></dt>
+<dt id="codeflare_sdk.cluster.cluster.Cluster.job_client"><code class="name">var <span class="ident">job_client</span></code></dt>
 <dd>
 <div class="desc"></div>
 <details class="source">
@@ -1361,23 +1541,25 @@ <h3>Instance variables</h3>
 <span>Expand source code</span>
 </summary>
 <pre><code class="python">@property
-def client(self):
-    if self._client:
-        return self._client
+def job_client(self):
+    if self._job_submission_client:
+        return self._job_submission_client
     if self.config.openshift_oauth:
         print(
             api_config_handler().configuration.get_api_key_with_prefix(
                 &#34;authorization&#34;
             )
         )
-        self._client = JobSubmissionClient(
+        self._job_submission_client = JobSubmissionClient(
             self.cluster_dashboard_uri(),
             headers=self._client_headers,
             verify=self._client_verify_tls,
         )
     else:
-        self._client = JobSubmissionClient(self.cluster_dashboard_uri())
-    return self._client</code></pre>
+        self._job_submission_client = JobSubmissionClient(
+            self.cluster_dashboard_uri()
+        )
+    return self._job_submission_client</code></pre>
 </details>
 </dd>
 </dl>
@@ -1464,6 +1646,10 @@ <h3>Methods</h3>
 
     # Before attempting to create the cluster AW, let&#39;s evaluate the ClusterConfig
     if self.config.dispatch_priority:
+        if not self.config.mcad:
+            raise ValueError(
+                &#34;Invalid Cluster Configuration, cannot have dispatch priority without MCAD&#34;
+            )
         priority_val = self.evaluate_dispatch_priority()
         if priority_val == None:
             raise ValueError(
@@ -1486,6 +1672,7 @@ <h3>Methods</h3>
     template = self.config.template
     image = self.config.image
     instascale = self.config.instascale
+    mcad = self.config.mcad
     instance_types = self.config.machine_types
     env = self.config.envs
     local_interactive = self.config.local_interactive
@@ -1506,6 +1693,7 @@ <h3>Methods</h3>
         template=template,
         image=image,
         instascale=instascale,
+        mcad=mcad,
         instance_types=instance_types,
         env=env,
         local_interactive=local_interactive,
@@ -1551,13 +1739,16 @@ <h3>Methods</h3>
     try:
         config_check()
         api_instance = client.CustomObjectsApi(api_config_handler())
-        api_instance.delete_namespaced_custom_object(
-            group=&#34;workload.codeflare.dev&#34;,
-            version=&#34;v1beta1&#34;,
-            namespace=namespace,
-            plural=&#34;appwrappers&#34;,
-            name=self.app_wrapper_name,
-        )
+        if self.config.mcad:
+            api_instance.delete_namespaced_custom_object(
+                group=&#34;workload.codeflare.dev&#34;,
+                version=&#34;v1beta1&#34;,
+                namespace=namespace,
+                plural=&#34;appwrappers&#34;,
+                name=self.app_wrapper_name,
+            )
+        else:
+            self._component_resources_down(namespace, api_instance)
     except Exception as e:  # pragma: no cover
         return _kube_api_error_handling(e)
 
@@ -1598,7 +1789,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="codeflare_sdk.cluster.cluster.Cluster.from_k8_cluster_object"><code class="name flex">
-<span>def <span class="ident">from_k8_cluster_object</span></span>(<span>rc)</span>
+<span>def <span class="ident">from_k8_cluster_object</span></span>(<span>rc, mcad=True)</span>
 </code></dt>
 <dd>
 <div class="desc"></div>
@@ -1606,7 +1797,7 @@ <h3>Methods</h3>
 <summary>
 <span>Expand source code</span>
 </summary>
-<pre><code class="python">def from_k8_cluster_object(rc):
+<pre><code class="python">def from_k8_cluster_object(rc, mcad=True):
     machine_types = (
         rc[&#34;metadata&#34;][&#34;labels&#34;][&#34;orderedinstance&#34;].split(&#34;_&#34;)
         if &#34;orderedinstance&#34; in rc[&#34;metadata&#34;][&#34;labels&#34;]
@@ -1645,6 +1836,7 @@ <h3>Methods</h3>
             0
         ][&#34;image&#34;],
         local_interactive=local_interactive,
+        mcad=mcad,
     )
     return Cluster(cluster_config)</code></pre>
 </details>
@@ -1688,7 +1880,7 @@ <h3>Methods</h3>
     &#34;&#34;&#34;
     This method accesses the head ray node in your cluster and returns the logs for the provided job id.
     &#34;&#34;&#34;
-    return self.client.get_job_logs(job_id)</code></pre>
+    return self.job_client.get_job_logs(job_id)</code></pre>
 </details>
 </dd>
 <dt id="codeflare_sdk.cluster.cluster.Cluster.job_status"><code class="name flex">
@@ -1704,7 +1896,7 @@ <h3>Methods</h3>
     &#34;&#34;&#34;
     This method accesses the head ray node in your cluster and returns the job status for the provided job id.
     &#34;&#34;&#34;
-    return self.client.get_job_status(job_id)</code></pre>
+    return self.job_client.get_job_status(job_id)</code></pre>
 </details>
 </dd>
 <dt id="codeflare_sdk.cluster.cluster.Cluster.list_jobs"><code class="name flex">
@@ -1720,7 +1912,7 @@ <h3>Methods</h3>
     &#34;&#34;&#34;
     This method accesses the head ray node in your cluster and lists the running jobs.
     &#34;&#34;&#34;
-    return self.client.list_jobs()</code></pre>
+    return self.job_client.list_jobs()</code></pre>
 </details>
 </dd>
 <dt id="codeflare_sdk.cluster.cluster.Cluster.local_client_url"><code class="name flex">
@@ -1759,42 +1951,46 @@ <h3>Methods</h3>
     &#34;&#34;&#34;
     ready = False
     status = CodeFlareClusterStatus.UNKNOWN
-    # check the app wrapper status
-    appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
-    if appwrapper:
-        if appwrapper.status in [
-            AppWrapperStatus.RUNNING,
-            AppWrapperStatus.COMPLETED,
-            AppWrapperStatus.RUNNING_HOLD_COMPLETION,
-        ]:
-            ready = False
-            status = CodeFlareClusterStatus.STARTING
-        elif appwrapper.status in [
-            AppWrapperStatus.FAILED,
-            AppWrapperStatus.DELETED,
-        ]:
-            ready = False
-            status = CodeFlareClusterStatus.FAILED  # should deleted be separate
-            return status, ready  # exit early, no need to check ray status
-        elif appwrapper.status in [
-            AppWrapperStatus.PENDING,
-            AppWrapperStatus.QUEUEING,
-        ]:
-            ready = False
-            if appwrapper.status == AppWrapperStatus.PENDING:
-                status = CodeFlareClusterStatus.QUEUED
-            else:
-                status = CodeFlareClusterStatus.QUEUEING
-            if print_to_console:
-                pretty_print.print_app_wrappers_status([appwrapper])
-            return (
-                status,
-                ready,
-            )  # no need to check the ray status since still in queue
+    if self.config.mcad:
+        # check the app wrapper status
+        appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
+        if appwrapper:
+            if appwrapper.status in [
+                AppWrapperStatus.RUNNING,
+                AppWrapperStatus.COMPLETED,
+                AppWrapperStatus.RUNNING_HOLD_COMPLETION,
+            ]:
+                ready = False
+                status = CodeFlareClusterStatus.STARTING
+            elif appwrapper.status in [
+                AppWrapperStatus.FAILED,
+                AppWrapperStatus.DELETED,
+            ]:
+                ready = False
+                status = CodeFlareClusterStatus.FAILED  # should deleted be separate
+                return status, ready  # exit early, no need to check ray status
+            elif appwrapper.status in [
+                AppWrapperStatus.PENDING,
+                AppWrapperStatus.QUEUEING,
+            ]:
+                ready = False
+                if appwrapper.status == AppWrapperStatus.PENDING:
+                    status = CodeFlareClusterStatus.QUEUED
+                else:
+                    status = CodeFlareClusterStatus.QUEUEING
+                if print_to_console:
+                    pretty_print.print_app_wrappers_status([appwrapper])
+                return (
+                    status,
+                    ready,
+                )  # no need to check the ray status since still in queue
 
     # check the ray cluster status
     cluster = _ray_cluster_status(self.config.name, self.config.namespace)
-    if cluster and not cluster.status == RayClusterStatus.UNKNOWN:
+    if cluster:
+        if cluster.status == RayClusterStatus.UNKNOWN:
+            ready = False
+            status = CodeFlareClusterStatus.STARTING
         if cluster.status == RayClusterStatus.READY:
             ready = True
             status = CodeFlareClusterStatus.READY
@@ -1866,15 +2062,18 @@ <h3>Methods</h3>
     try:
         config_check()
         api_instance = client.CustomObjectsApi(api_config_handler())
-        with open(self.app_wrapper_yaml) as f:
-            aw = yaml.load(f, Loader=yaml.FullLoader)
-        api_instance.create_namespaced_custom_object(
-            group=&#34;workload.codeflare.dev&#34;,
-            version=&#34;v1beta1&#34;,
-            namespace=namespace,
-            plural=&#34;appwrappers&#34;,
-            body=aw,
-        )
+        if self.config.mcad:
+            with open(self.app_wrapper_yaml) as f:
+                aw = yaml.load(f, Loader=yaml.FullLoader)
+            api_instance.create_namespaced_custom_object(
+                group=&#34;workload.codeflare.dev&#34;,
+                version=&#34;v1beta1&#34;,
+                namespace=namespace,
+                plural=&#34;appwrappers&#34;,
+                body=aw,
+            )
+        else:
+            self._component_resources_up(namespace, api_instance)
     except Exception as e:  # pragma: no cover
         return _kube_api_error_handling(e)</code></pre>
 </details>
@@ -1956,7 +2155,6 @@ <h1>Index</h1>
 <li>
 <h4><code><a title="codeflare_sdk.cluster.cluster.Cluster" href="#codeflare_sdk.cluster.cluster.Cluster">Cluster</a></code></h4>
 <ul class="">
-<li><code><a title="codeflare_sdk.cluster.cluster.Cluster.client" href="#codeflare_sdk.cluster.cluster.Cluster.client">client</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri" href="#codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri">cluster_dashboard_uri</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.cluster_uri" href="#codeflare_sdk.cluster.cluster.Cluster.cluster_uri">cluster_uri</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.create_app_wrapper" href="#codeflare_sdk.cluster.cluster.Cluster.create_app_wrapper">create_app_wrapper</a></code></li>
@@ -1965,6 +2163,7 @@ <h4><code><a title="codeflare_sdk.cluster.cluster.Cluster" href="#codeflare_sdk.
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.evaluate_dispatch_priority" href="#codeflare_sdk.cluster.cluster.Cluster.evaluate_dispatch_priority">evaluate_dispatch_priority</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.from_k8_cluster_object" href="#codeflare_sdk.cluster.cluster.Cluster.from_k8_cluster_object">from_k8_cluster_object</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.is_dashboard_ready" href="#codeflare_sdk.cluster.cluster.Cluster.is_dashboard_ready">is_dashboard_ready</a></code></li>
+<li><code><a title="codeflare_sdk.cluster.cluster.Cluster.job_client" href="#codeflare_sdk.cluster.cluster.Cluster.job_client">job_client</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.job_logs" href="#codeflare_sdk.cluster.cluster.Cluster.job_logs">job_logs</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.job_status" href="#codeflare_sdk.cluster.cluster.Cluster.job_status">job_status</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.cluster.Cluster.list_jobs" href="#codeflare_sdk.cluster.cluster.Cluster.list_jobs">list_jobs</a></code></li>
diff --git a/docs/cluster/config.html b/docs/cluster/config.html
index 28830390a..37242b177 100644
--- a/docs/cluster/config.html
+++ b/docs/cluster/config.html
@@ -78,6 +78,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.config</code></h1>
     num_gpus: int = 0
     template: str = f&#34;{dir}/templates/base-template.yaml&#34;
     instascale: bool = False
+    mcad: bool = True
     envs: dict = field(default_factory=dict)
     image: str = &#34;quay.io/project-codeflare/ray:latest-py39-cu118&#34;
     local_interactive: bool = False
@@ -97,7 +98,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 <dl>
 <dt id="codeflare_sdk.cluster.config.ClusterConfiguration"><code class="flex name class">
 <span>class <span class="ident">ClusterConfiguration</span></span>
-<span>(</span><span>name: str, namespace: str = None, head_info: list = &lt;factory&gt;, head_cpus: int = 2, head_memory: int = 8, head_gpus: int = 0, machine_types: list = &lt;factory&gt;, min_cpus: int = 1, max_cpus: int = 1, num_workers: int = 1, min_memory: int = 2, max_memory: int = 2, num_gpus: int = 0, template: str = '/home/runner/work/codeflare-sdk/codeflare-sdk/src/codeflare_sdk/templates/base-template.yaml', instascale: bool = False, envs: dict = &lt;factory&gt;, image: str = 'quay.io/project-codeflare/ray:latest-py39-cu118', local_interactive: bool = False, image_pull_secrets: list = &lt;factory&gt;, dispatch_priority: str = None, openshift_oauth: bool = False)</span>
+<span>(</span><span>name: str, namespace: str = None, head_info: list = &lt;factory&gt;, head_cpus: int = 2, head_memory: int = 8, head_gpus: int = 0, machine_types: list = &lt;factory&gt;, min_cpus: int = 1, max_cpus: int = 1, num_workers: int = 1, min_memory: int = 2, max_memory: int = 2, num_gpus: int = 0, template: str = '/home/runner/work/codeflare-sdk/codeflare-sdk/src/codeflare_sdk/templates/base-template.yaml', instascale: bool = False, mcad: bool = True, envs: dict = &lt;factory&gt;, image: str = 'quay.io/project-codeflare/ray:latest-py39-cu118', local_interactive: bool = False, image_pull_secrets: list = &lt;factory&gt;, dispatch_priority: str = None, openshift_oauth: bool = False)</span>
 </code></dt>
 <dd>
 <div class="desc"><p>This dataclass is used to specify resource requirements and other details, and
@@ -127,6 +128,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
     num_gpus: int = 0
     template: str = f&#34;{dir}/templates/base-template.yaml&#34;
     instascale: bool = False
+    mcad: bool = True
     envs: dict = field(default_factory=dict)
     image: str = &#34;quay.io/project-codeflare/ray:latest-py39-cu118&#34;
     local_interactive: bool = False
@@ -188,6 +190,10 @@ <h3>Class variables</h3>
 <dd>
 <div class="desc"></div>
 </dd>
+<dt id="codeflare_sdk.cluster.config.ClusterConfiguration.mcad"><code class="name">var <span class="ident">mcad</span> : bool</code></dt>
+<dd>
+<div class="desc"></div>
+</dd>
 <dt id="codeflare_sdk.cluster.config.ClusterConfiguration.min_cpus"><code class="name">var <span class="ident">min_cpus</span> : int</code></dt>
 <dd>
 <div class="desc"></div>
@@ -254,6 +260,7 @@ <h4><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration" href="#co
 <li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.machine_types" href="#codeflare_sdk.cluster.config.ClusterConfiguration.machine_types">machine_types</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.max_cpus" href="#codeflare_sdk.cluster.config.ClusterConfiguration.max_cpus">max_cpus</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.max_memory" href="#codeflare_sdk.cluster.config.ClusterConfiguration.max_memory">max_memory</a></code></li>
+<li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.mcad" href="#codeflare_sdk.cluster.config.ClusterConfiguration.mcad">mcad</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.min_cpus" href="#codeflare_sdk.cluster.config.ClusterConfiguration.min_cpus">min_cpus</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.min_memory" href="#codeflare_sdk.cluster.config.ClusterConfiguration.min_memory">min_memory</a></code></li>
 <li><code><a title="codeflare_sdk.cluster.config.ClusterConfiguration.name" href="#codeflare_sdk.cluster.config.ClusterConfiguration.name">name</a></code></li>
diff --git a/docs/job/jobs.html b/docs/job/jobs.html
index 266da13ec..ea587df8d 100644
--- a/docs/job/jobs.html
+++ b/docs/job/jobs.html
@@ -50,9 +50,6 @@ <h1 class="title">Module <code>codeflare_sdk.job.jobs</code></h1>
 from torchx.schedulers.ray_scheduler import RayScheduler
 from torchx.specs import AppHandle, parse_app_handle, AppDryRunInfo
 
-from ray.job_submission import JobSubmissionClient
-
-import openshift as oc
 
 if TYPE_CHECKING:
     from ..cluster.cluster import Cluster
@@ -124,9 +121,9 @@ <h1 class="title">Module <code>codeflare_sdk.job.jobs</code></h1>
 
     def _dry_run(self, cluster: &#34;Cluster&#34;):
         j = f&#34;{cluster.config.num_workers}x{max(cluster.config.num_gpus, 1)}&#34;  # # of proc. = # of gpus
-        runner = get_runner(ray_client=cluster.client)
+        runner = get_runner(ray_client=cluster.job_client)
         runner._scheduler_instances[&#34;ray&#34;] = RayScheduler(
-            session_name=runner._name, ray_client=cluster.client
+            session_name=runner._name, ray_client=cluster.job_client
         )
         return (
             runner.dryrun(
@@ -381,9 +378,9 @@ <h3>Methods</h3>
 
     def _dry_run(self, cluster: &#34;Cluster&#34;):
         j = f&#34;{cluster.config.num_workers}x{max(cluster.config.num_gpus, 1)}&#34;  # # of proc. = # of gpus
-        runner = get_runner(ray_client=cluster.client)
+        runner = get_runner(ray_client=cluster.job_client)
         runner._scheduler_instances[&#34;ray&#34;] = RayScheduler(
-            session_name=runner._name, ray_client=cluster.client
+            session_name=runner._name, ray_client=cluster.job_client
         )
         return (
             runner.dryrun(
diff --git a/docs/utils/generate_yaml.html b/docs/utils/generate_yaml.html
index 2091f8b33..4c0ecd3fd 100644
--- a/docs/utils/generate_yaml.html
+++ b/docs/utils/generate_yaml.html
@@ -488,6 +488,19 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
     )
 
 
+def write_components(user_yaml: dict, output_file_name: str):
+    components = user_yaml.get(&#34;spec&#34;, &#34;resources&#34;)[&#34;resources&#34;].get(&#34;GenericItems&#34;)
+    open(output_file_name, &#34;w&#34;).close()
+    with open(output_file_name, &#34;a&#34;) as outfile:
+        for component in components:
+            if &#34;generictemplate&#34; in component:
+                outfile.write(&#34;---\n&#34;)
+                yaml.dump(
+                    component[&#34;generictemplate&#34;], outfile, default_flow_style=False
+                )
+    print(f&#34;Written to: {output_file_name}&#34;)
+
+
 def generate_appwrapper(
     name: str,
     namespace: str,
@@ -503,6 +516,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
     template: str,
     image: str,
     instascale: bool,
+    mcad: bool,
     instance_types: list,
     env,
     local_interactive: bool,
@@ -558,7 +572,10 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
         enable_openshift_oauth(user_yaml, cluster_name, namespace)
 
     outfile = appwrapper_name + &#34;.yaml&#34;
-    write_user_appwrapper(user_yaml, outfile)
+    if not mcad:
+        write_components(user_yaml, outfile)
+    else:
+        write_user_appwrapper(user_yaml, outfile)
     return outfile</code></pre>
 </details>
 </section>
@@ -775,7 +792,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
 </details>
 </dd>
 <dt id="codeflare_sdk.utils.generate_yaml.generate_appwrapper"><code class="name flex">
-<span>def <span class="ident">generate_appwrapper</span></span>(<span>name: str, namespace: str, head_cpus: int, head_memory: int, head_gpus: int, min_cpu: int, max_cpu: int, min_memory: int, max_memory: int, gpu: int, workers: int, template: str, image: str, instascale: bool, instance_types: list, env, local_interactive: bool, image_pull_secrets: list, dispatch_priority: str, priority_val: int, openshift_oauth: bool)</span>
+<span>def <span class="ident">generate_appwrapper</span></span>(<span>name: str, namespace: str, head_cpus: int, head_memory: int, head_gpus: int, min_cpu: int, max_cpu: int, min_memory: int, max_memory: int, gpu: int, workers: int, template: str, image: str, instascale: bool, mcad: bool, instance_types: list, env, local_interactive: bool, image_pull_secrets: list, dispatch_priority: str, priority_val: int, openshift_oauth: bool)</span>
 </code></dt>
 <dd>
 <div class="desc"></div>
@@ -798,6 +815,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
     template: str,
     image: str,
     instascale: bool,
+    mcad: bool,
     instance_types: list,
     env,
     local_interactive: bool,
@@ -853,7 +871,10 @@ <h2 class="section-title" id="header-functions">Functions</h2>
         enable_openshift_oauth(user_yaml, cluster_name, namespace)
 
     outfile = appwrapper_name + &#34;.yaml&#34;
-    write_user_appwrapper(user_yaml, outfile)
+    if not mcad:
+        write_components(user_yaml, outfile)
+    else:
+        write_user_appwrapper(user_yaml, outfile)
     return outfile</code></pre>
 </details>
 </dd>
@@ -1209,6 +1230,28 @@ <h2 class="section-title" id="header-functions">Functions</h2>
             limits[&#34;nvidia.com/gpu&#34;] = gpu</code></pre>
 </details>
 </dd>
+<dt id="codeflare_sdk.utils.generate_yaml.write_components"><code class="name flex">
+<span>def <span class="ident">write_components</span></span>(<span>user_yaml: dict, output_file_name: str)</span>
+</code></dt>
+<dd>
+<div class="desc"></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def write_components(user_yaml: dict, output_file_name: str):
+    components = user_yaml.get(&#34;spec&#34;, &#34;resources&#34;)[&#34;resources&#34;].get(&#34;GenericItems&#34;)
+    open(output_file_name, &#34;w&#34;).close()
+    with open(output_file_name, &#34;a&#34;) as outfile:
+        for component in components:
+            if &#34;generictemplate&#34; in component:
+                outfile.write(&#34;---\n&#34;)
+                yaml.dump(
+                    component[&#34;generictemplate&#34;], outfile, default_flow_style=False
+                )
+    print(f&#34;Written to: {output_file_name}&#34;)</code></pre>
+</details>
+</dd>
 <dt id="codeflare_sdk.utils.generate_yaml.write_user_appwrapper"><code class="name flex">
 <span>def <span class="ident">write_user_appwrapper</span></span>(<span>user_yaml, output_file_name)</span>
 </code></dt>
@@ -1262,6 +1305,7 @@ <h1>Index</h1>
 <li><code><a title="codeflare_sdk.utils.generate_yaml.update_priority" href="#codeflare_sdk.utils.generate_yaml.update_priority">update_priority</a></code></li>
 <li><code><a title="codeflare_sdk.utils.generate_yaml.update_rayclient_route" href="#codeflare_sdk.utils.generate_yaml.update_rayclient_route">update_rayclient_route</a></code></li>
 <li><code><a title="codeflare_sdk.utils.generate_yaml.update_resources" href="#codeflare_sdk.utils.generate_yaml.update_resources">update_resources</a></code></li>
+<li><code><a title="codeflare_sdk.utils.generate_yaml.write_components" href="#codeflare_sdk.utils.generate_yaml.write_components">write_components</a></code></li>
 <li><code><a title="codeflare_sdk.utils.generate_yaml.write_user_appwrapper" href="#codeflare_sdk.utils.generate_yaml.write_user_appwrapper">write_user_appwrapper</a></code></li>
 </ul>
 </li>
diff --git a/docs/utils/kube_api_helpers.html b/docs/utils/kube_api_helpers.html
index 37034ab78..4105a4c5a 100644
--- a/docs/utils/kube_api_helpers.html
+++ b/docs/utils/kube_api_helpers.html
@@ -54,7 +54,9 @@ <h1 class="title">Module <code>codeflare_sdk.utils.kube_api_helpers</code></h1>
 
 
 # private methods
-def _kube_api_error_handling(e: Exception):  # pragma: no cover
+def _kube_api_error_handling(
+    e: Exception, print_error: bool = True
+):  # pragma: no cover
     perm_msg = (
         &#34;Action not permitted, have you put in correct/up-to-date auth credentials?&#34;
     )
@@ -63,11 +65,13 @@ <h1 class="title">Module <code>codeflare_sdk.utils.kube_api_helpers</code></h1>
     if type(e) == config.ConfigException:
         raise PermissionError(perm_msg)
     if type(e) == executing.executing.NotOneValueFound:
-        print(nf_msg)
+        if print_error:
+            print(nf_msg)
         return
     if type(e) == client.ApiException:
         if e.reason == &#34;Not Found&#34;:
-            print(nf_msg)
+            if print_error:
+                print(nf_msg)
             return
         elif e.reason == &#34;Unauthorized&#34; or e.reason == &#34;Forbidden&#34;:
             raise PermissionError(perm_msg)