diff --git a/.gitignore b/.gitignore
index 0150516..7359bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -356,4 +356,4 @@ example/*
 docs/*
 
 # Test outputs
-tests/client/workflow/fixtures/export_general.yml
\ No newline at end of file
+tests/client/workflow/export_general.yml
\ No newline at end of file
diff --git a/src/client/app.ts b/src/client/app.ts
index cf5a8dc..9457d3e 100644
--- a/src/client/app.ts
+++ b/src/client/app.ts
@@ -41,10 +41,11 @@ import { StatusCode } from "clarifai-nodejs-grpc/proto/clarifai/api/status/statu
 import * as fs from "fs";
 import * as yaml from "js-yaml";
 import { validateWorkflow } from "../workflows/validate";
-import { getYamlOutputInfoProto, isSameYamlModel } from "../workflows/utils";
+import { getYamlOutputInfoProto } from "../workflows/utils";
 import { Model as ModelConstructor } from "./model";
 import { uuid } from "uuidv4";
 import { fromProtobufObject } from "from-protobuf-object";
+import { fromPartialProtobufObject } from "./fromPartialProtobufObject";
 
 type AppConfig =
   | {
@@ -340,9 +341,10 @@ export class App extends Lister {
   }): Promise<Model.AsObject> {
     const request = new PostModelsRequest();
     request.setUserAppId(this.userAppId);
-    const newModel = new Model();
-    newModel.setId(modelId);
-    mapParamsToRequest(params, newModel);
+    const newModel = fromPartialProtobufObject(Model, {
+      id: modelId,
+      ...params,
+    });
     request.setModelsList([newModel]);
     const postModels = promisifyGrpcCall(
       this.STUB.client.postModels,
@@ -408,8 +410,8 @@ export class App extends Lister {
 
     // Get all model objects from the workflow nodes.
     const allModels: Model.AsObject[] = [];
-    let modelObject: Model.AsObject | undefined;
-    for (const node of workflow["nodes"]) {
+    for (const node of workflow.nodes) {
+      let modelObject: Model.AsObject | undefined;
       const outputInfo = getYamlOutputInfoProto(node?.model?.outputInfo ?? {});
       try {
         const model = await this.model({
@@ -417,7 +419,9 @@ export class App extends Lister {
           modelVersionId: node.model.modelVersionId ?? "",
         });
         modelObject = model;
-        if (model) allModels.push(model);
+        if (model) {
+          allModels.push(model);
+        }
       } catch (e) {
         // model doesn't exist, create a new model from yaml config
         if (
@@ -450,27 +454,27 @@ export class App extends Lister {
       }
 
       // If the model version ID is specified, or if the yaml model is the same as the one in the api
-      if (
-        (node.model.modelVersionId ?? "") ||
-        (modelObject && isSameYamlModel(modelObject, node.model))
-      ) {
-        allModels.push(modelObject!);
-      } else if (modelObject && outputInfo) {
-        const model = new ModelConstructor({
-          modelId: modelObject.id,
-          authConfig: {
-            pat: this.pat,
-            appId: this.userAppId.getAppId(),
-            userId: this.userAppId.getUserId(),
-          },
-        });
-        const modelVersion = await model.createVersion({
-          outputInfo: outputInfo.toObject(),
-        });
-        if (modelVersion.model) {
-          allModels.push(modelVersion.model);
-        }
-      }
+      // if (
+      //   (node.model.modelVersionId ?? "") ||
+      //   (modelObject && isSameYamlModel(modelObject, node.model))
+      // ) {
+      //   allModels.push(modelObject!);
+      // } else if (modelObject && outputInfo) {
+      //   const model = new ModelConstructor({
+      //     modelId: modelObject.id,
+      //     authConfig: {
+      //       pat: this.pat,
+      //       appId: this.userAppId.getAppId(),
+      //       userId: this.userAppId.getUserId(),
+      //     },
+      //   });
+      //   const modelVersion = await model.createVersion({
+      //     outputInfo: outputInfo.toObject(),
+      //   });
+      //   if (modelVersion.model) {
+      //     allModels.push(modelVersion.model);
+      //   }
+      // }
     }
 
     // Convert nodes to resources_pb2.WorkflowNodes.
diff --git a/src/client/fromPartialProtobufObject.ts b/src/client/fromPartialProtobufObject.ts
new file mode 100644
index 0000000..bd78bf7
--- /dev/null
+++ b/src/client/fromPartialProtobufObject.ts
@@ -0,0 +1,235 @@
+import { Message, Map as ProtobufMap } from "google-protobuf";
+
+type MessageConstructor<T extends Message> = new () => T;
+
+type AsObject<T extends Message> = ReturnType<T["toObject"]>;
+
+const enum PREFIX {
+  SET = "set",
+  GET = "get",
+  CLEAR = "clear",
+}
+
+/**
+ * Based on "from-protobuf-object" package - except accepts data with Partial keys
+ */
+export function fromPartialProtobufObject<T extends Message>(
+  MessageType: MessageConstructor<T>,
+  data: Partial<AsObject<T>>,
+): T {
+  const instance = new MessageType();
+  validateMissingProps(instance, data);
+  for (const [prop, value] of Object.entries(
+    filterExtraProps(instance, data),
+  )) {
+    if (Array.isArray(value) && isProtobufMap(instance, prop)) {
+      const mapMethod = getMethod(prop, PREFIX.GET);
+      const map = callMethod(instance, mapMethod) as ProtobufMap<
+        unknown,
+        unknown
+      >;
+      const NestedType = retrieveNestedMapTypePatch(instance, prop);
+      for (const [k, v] of value) {
+        if (!isObject(v, prop)) {
+          map.set(k, v);
+          continue;
+        }
+        if (!NestedType) {
+          throw new Error("Unable to retrieve nested type");
+        }
+        map.set(k, fromPartialProtobufObject(NestedType, v));
+      }
+      continue;
+    }
+    const result = getResult(instance, prop, value);
+    validateType(instance, prop, value);
+    const setter = getMethod(prop, PREFIX.SET);
+    callMethod(instance, setter, result);
+  }
+  return instance;
+}
+
+function getResult<T extends Message>(
+  instance: T,
+  prop: string,
+  value: unknown,
+): unknown {
+  if (value instanceof Uint8Array) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 0 || !isArrayOfObjects(value, prop)) {
+      return value;
+    }
+    const NestedType = retrieveNestedRepeatedTypePatch(instance, prop);
+    if (!NestedType) {
+      throw new Error("Unable to retrieve nested type");
+    }
+    return value.map((child) => fromPartialProtobufObject(NestedType, child));
+  }
+  if (isObject(value, prop)) {
+    const NestedType = retrieveNestedTypePatch(instance, prop);
+    if (!NestedType) {
+      throw new Error("Unable to retrieve nested type");
+    }
+    return fromPartialProtobufObject(NestedType, value as object);
+  }
+  return value;
+}
+
+function callMethod<T extends object, R>(
+  obj: T,
+  key: string,
+  value?: unknown,
+): R {
+  return (obj[key as keyof T] as (value: unknown) => R)(value);
+}
+
+function getProp(key: string, prefix: PREFIX): string {
+  const prop = key.slice(prefix.length);
+  return prop.slice(0, 1).toLowerCase() + prop.slice(1);
+}
+
+function getMethod(prop: string, prefix: PREFIX): string {
+  return `${prefix}${prop[0].toUpperCase()}${prop.slice(1)}`;
+}
+
+function getInstancePropsFromKeys(keys: string[], prefix: PREFIX): string[] {
+  return keys
+    .filter((key) => key.startsWith(prefix))
+    .map((key) => getProp(key, prefix));
+}
+
+function getInstanceProps<T extends Message>(instance: T): string[] {
+  const keys = Object.keys(Object.getPrototypeOf(instance));
+  const setters = getInstancePropsFromKeys(keys, PREFIX.SET);
+  const maps = getInstancePropsFromKeys(keys, PREFIX.CLEAR).filter((prop) =>
+    isProtobufMap(instance, prop),
+  );
+  return [...setters, ...maps];
+}
+
+function isProtobufMap<T extends Message>(instance: T, prop: string): boolean {
+  return (
+    callMethod(instance, getMethod(prop, PREFIX.GET)) instanceof ProtobufMap
+  );
+}
+
+function isOptional<T extends Message>(instance: T, prop: string): boolean {
+  const clearMethod = getMethod(prop, PREFIX.CLEAR);
+  return clearMethod in instance;
+}
+
+function validateMissingProps<T extends Message>(
+  instance: T,
+  data: Partial<AsObject<T>>,
+): void {
+  const instanceProps = getInstanceProps(instance);
+  const dataProps = Object.keys(data);
+  for (const prop of instanceProps) {
+    if (!dataProps.includes(prop) && !isOptional(instance, prop)) {
+      //   throw new Error(`Missing property '${prop}'`);
+    }
+  }
+}
+
+function filterExtraProps<T extends Message>(
+  instance: T,
+  data: Partial<AsObject<T>>,
+): Partial<AsObject<T>> {
+  const instanceProps = getInstanceProps(instance);
+  return Object.fromEntries(
+    Object.entries(data).filter(
+      ([key, value]) => instanceProps.includes(key) && value !== undefined,
+    ),
+  ) as Partial<AsObject<T>>;
+}
+
+function isObject(value: unknown, prop: string): boolean {
+  if (value === null) {
+    throw new Error(`Null value for key '${prop}'`);
+  }
+  return typeof value === "object";
+}
+
+function isArrayOfObjects(arr: unknown[], prop: string): boolean {
+  if (arr.every((item) => isObject(item, prop))) {
+    return true;
+  }
+  if (arr.every((item) => !isObject(item, prop))) {
+    return false;
+  }
+  throw new Error(`Mixed array for '${prop}'`);
+}
+
+function validateType<T extends Message>(
+  instance: T,
+  prop: string,
+  value: unknown,
+): void {
+  const getter = getMethod(prop, PREFIX.GET);
+  const instanceValue = callMethod(instance, getter);
+  const expectedType =
+    instanceValue !== undefined ? typeof instanceValue : "object";
+  const actualType = value instanceof Uint8Array ? "string" : typeof value;
+  if (Array.isArray(instanceValue) && !Array.isArray(value)) {
+    throw new Error(
+      `Invalid type for '${prop}' (expected array, got '${actualType}')`,
+    );
+  }
+  if (!Array.isArray(instanceValue) && Array.isArray(value)) {
+    throw new Error(
+      `Invalid type for '${prop}' (expected '${expectedType}', got array)`,
+    );
+  }
+  if (expectedType !== actualType) {
+    throw new Error(
+      `Invalid type for '${prop}' (expected '${expectedType}', got '${actualType}')`,
+    );
+  }
+}
+
+function retrieveNestedTypePatch<T extends Message, N extends Message>(
+  instance: T,
+  prop: string,
+): MessageConstructor<N> | null {
+  const getWrapperField = Message.getWrapperField;
+  let nestedType: MessageConstructor<Message> | null = null;
+  Message.getWrapperField = function (msg, ctor, fieldNumber, required) {
+    nestedType = ctor;
+    return getWrapperField(msg, ctor, fieldNumber, required);
+  };
+  callMethod(instance, getMethod(prop, PREFIX.GET));
+  Message.getWrapperField = getWrapperField;
+  return nestedType;
+}
+
+function retrieveNestedRepeatedTypePatch<T extends Message, N extends Message>(
+  instance: T,
+  prop: string,
+): MessageConstructor<N> | null {
+  const getRepeatedWrapperField = Message.getRepeatedWrapperField;
+  let nestedType: MessageConstructor<Message> | null = null;
+  Message.getRepeatedWrapperField = function (msg, ctor, fieldNumber) {
+    nestedType = ctor;
+    return getRepeatedWrapperField(msg, ctor, fieldNumber);
+  };
+  callMethod(instance, getMethod(prop, PREFIX.GET));
+  Message.getRepeatedWrapperField = getRepeatedWrapperField;
+  return nestedType;
+}
+
+function retrieveNestedMapTypePatch<T extends Message, N extends Message>(
+  instance: T,
+  prop: string,
+): MessageConstructor<N> | null {
+  const getMapField = Message.getMapField;
+  let nestedType: typeof Message | null = null;
+  Message.getMapField = function (msg, fieldNumber, noLazyCreate, valueCtor) {
+    nestedType = valueCtor ?? null;
+    return getMapField(msg, fieldNumber, noLazyCreate, valueCtor);
+  };
+  callMethod(instance, getMethod(prop, PREFIX.GET));
+  Message.getMapField = getMapField;
+  return nestedType;
+}
diff --git a/src/client/model.ts b/src/client/model.ts
index cb64e71..3d4d465 100644
--- a/src/client/model.ts
+++ b/src/client/model.ts
@@ -43,6 +43,7 @@ import {
   JavaScriptValue,
   Struct,
 } from "google-protobuf/google/protobuf/struct_pb";
+import { fromPartialProtobufObject } from "./fromPartialProtobufObject";
 
 export class Model extends Lister {
   // @ts-expect-error - Variable yet to be used
@@ -369,8 +370,7 @@ export class Model extends Lister {
     const request = new PostModelVersionsRequest();
     request.setUserAppId(this.userAppId);
     request.setModelId(this.id);
-    const modelVersion = new ModelVersion();
-    mapParamsToRequest(args, modelVersion);
+    const modelVersion = fromPartialProtobufObject(ModelVersion, args);
     request.setModelVersionsList([modelVersion]);
 
     const postModelVersions = promisifyGrpcCall(
@@ -383,7 +383,7 @@ export class Model extends Lister {
     const responseObject = response.toObject();
 
     if (responseObject.status?.code !== StatusCode.SUCCESS) {
-      throw new Error(responseObject.status?.toString());
+      throw new Error(responseObject.status?.description);
     }
 
     return responseObject;
diff --git a/tests/client/workflow/fixtures/general.yml b/tests/client/workflow/fixtures/general.yml
new file mode 100644
index 0000000..9145904
--- /dev/null
+++ b/tests/client/workflow/fixtures/general.yml
@@ -0,0 +1,17 @@
+workflow:
+  id: General
+  nodes:
+    - id: general-v1.5-concept
+      model:
+          modelId: general-image-recognition
+          modelVersionId: aa7f35c01e0642fda5cf400f543e7c40
+    - id: general-v1.5-embed
+      model:
+          modelId: general-image-embedding
+          modelVersionId: bb186755eda04f9cbb6fe32e816be104
+    - id: general-v1.5-cluster
+      model:
+          modelId: general-clusterering
+          modelVersionId: cc2074cff6dc4c02b6f4e1b8606dcb54
+      nodeInputs:
+        - nodeId: general-v1.5-embed
diff --git a/tests/client/workflow/fixtures/multi_branch.yml b/tests/client/workflow/fixtures/multi_branch.yml
new file mode 100644
index 0000000..8a5ca67
--- /dev/null
+++ b/tests/client/workflow/fixtures/multi_branch.yml
@@ -0,0 +1,11 @@
+workflow:
+  id: test-mb
+  nodes:
+    - id: detector
+      model:
+          modelId: face-detection
+          modelVersionId: 45fb9a671625463fa646c3523a3087d5
+    - id: moderation
+      model:
+          modelId: moderation-recognition
+          modelVersionId: 7cde8e92896340b0998b8260d47f1502
diff --git a/tests/client/workflow/fixtures/multi_branch_multi_nodes.yml b/tests/client/workflow/fixtures/multi_branch_multi_nodes.yml
new file mode 100644
index 0000000..29438f2
--- /dev/null
+++ b/tests/client/workflow/fixtures/multi_branch_multi_nodes.yml
@@ -0,0 +1,23 @@
+workflow:
+  id: test-mbmn
+  nodes:
+    - id: detector
+      model:
+          modelId: face-detection
+          modelVersionId: 45fb9a671625463fa646c3523a3087d5
+    - id: cropper
+      model:
+          modelId: margin-110-image-crop
+          modelVersionId: b9987421b40a46649566826ef9325303
+      nodeInputs:
+        - nodeId: detector
+    - id: face-sentiment
+      model:
+          modelId: face-sentiment-recognition
+          modelVersionId: a5d7776f0c064a41b48c3ce039049f65
+      nodeInputs:
+        - nodeId: cropper
+    - id: moderation
+      model:
+          modelId: moderation-recognition
+          modelVersionId: 7cde8e92896340b0998b8260d47f1502
diff --git a/tests/client/workflow/fixtures/single_branch_with_custom_cropper_model-version.yml b/tests/client/workflow/fixtures/single_branch_with_custom_cropper_model-version.yml
new file mode 100644
index 0000000..1fe1e2b
--- /dev/null
+++ b/tests/client/workflow/fixtures/single_branch_with_custom_cropper_model-version.yml
@@ -0,0 +1,17 @@
+workflow:
+  id: test-sb-ccmv
+  nodes:
+    - id: detector
+      model:
+          modelId: face-detection
+          modelVersionId: 45fb9a671625463fa646c3523a3087d5
+    - id: cropper
+      model:
+          modelId: margin-100-image-crop-custom # Uses the same model ID as the other workflow with custom cropper model
+          modelTypeId: image-crop
+          description: Custom crop model
+          outputInfo:
+            params:
+              margin: 1.5 # Uses different margin than previous model to trigger the creation of a new model version.
+      nodeInputs:
+        - nodeId: detector
diff --git a/tests/client/workflow/fixtures/single_branch_with_custom_cropper_model.yml b/tests/client/workflow/fixtures/single_branch_with_custom_cropper_model.yml
new file mode 100644
index 0000000..e98b791
--- /dev/null
+++ b/tests/client/workflow/fixtures/single_branch_with_custom_cropper_model.yml
@@ -0,0 +1,17 @@
+workflow:
+  id: test-sb-ccm
+  nodes:
+    - id: detector
+      model:
+          modelId: face-detection
+          modelVersionId: 45fb9a671625463fa646c3523a3087d5
+    - id: cropper
+      model:
+          modelId: margin-100-image-crop-custom # such a model ID does not exist, so it will be created using the below model fields
+          modelTypeId: image-crop
+          description: Custom crop model
+          outputInfo:
+            params:
+              margin: 1.33
+      nodeInputs:
+        - nodeId: detector
diff --git a/tests/client/workflow/fixtures/single_branch_with_public_cropper_model.yml b/tests/client/workflow/fixtures/single_branch_with_public_cropper_model.yml
new file mode 100644
index 0000000..2d36825
--- /dev/null
+++ b/tests/client/workflow/fixtures/single_branch_with_public_cropper_model.yml
@@ -0,0 +1,13 @@
+workflow:
+  id: test-sb-pcm
+  nodes:
+    - id: detector
+      model:
+          modelId: face-detection
+          modelVersionId: 45fb9a671625463fa646c3523a3087d5
+    - id: cropper
+      model:
+          modelId: margin-110-image-crop
+          modelVersionId: b9987421b40a46649566826ef9325303
+      nodeInputs:
+        - nodeId: detector
diff --git a/tests/client/workflow/fixtures/single_branch_with_public_cropper_model_and_latest_version.yml b/tests/client/workflow/fixtures/single_branch_with_public_cropper_model_and_latest_version.yml
new file mode 100644
index 0000000..1461d41
--- /dev/null
+++ b/tests/client/workflow/fixtures/single_branch_with_public_cropper_model_and_latest_version.yml
@@ -0,0 +1,13 @@
+workflow:
+  id: test-sb-pcmlv
+  nodes:
+    - id: detector
+      model:
+          modelId: a403429f2ddf4b49b307e318f00e528b
+          modelVersionId: 34ce21a40cc24b6b96ffee54aabff139
+    - id: cropper
+      model:
+          modelId: margin-110-image-crop
+
+      nodeInputs:
+        - nodeId: detector
diff --git a/tests/client/workflow/fixtures/single_node.yml b/tests/client/workflow/fixtures/single_node.yml
new file mode 100644
index 0000000..ba81264
--- /dev/null
+++ b/tests/client/workflow/fixtures/single_node.yml
@@ -0,0 +1,8 @@
+# A single node workflow
+workflow:
+  id: test-sn
+  nodes:
+    - id: detector
+      model:
+          modelId: face-detection
+          modelVersionId: 45fb9a671625463fa646c3523a3087d5
diff --git a/tests/client/workflow/workflowCrud.integration.test.ts b/tests/client/workflow/workflowCrud.integration.test.ts
new file mode 100644
index 0000000..942d565
--- /dev/null
+++ b/tests/client/workflow/workflowCrud.integration.test.ts
@@ -0,0 +1,81 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest";
+import { App, User } from "../../../src/index";
+import path from "path";
+import * as fs from "fs";
+
+const NOW = "test-app-200"; // Date.now().toString();
+const CREATE_APP_USER_ID = import.meta.env.VITE_CLARIFAI_USER_ID;
+const CLARIFAI_PAT = import.meta.env.VITE_CLARIFAI_PAT;
+const CREATE_APP_ID = `test_workflow_create_delete_app_${NOW}`;
+const MAIN_APP_ID = "main";
+
+// const workflowFile = path.resolve(__dirname, "./export_general.yml");
+const workflowFixtures = path.resolve(__dirname, "./fixtures");
+
+// get all files in the workflowFixtures directory in an array
+const workflowFixtureFiles = fs
+  .readdirSync(workflowFixtures)
+  .map((each) => path.resolve(workflowFixtures, each));
+console.log(workflowFixtureFiles);
+
+describe("Workflow CRUD", () => {
+  let user: User;
+  let app: App;
+
+  beforeAll(async () => {
+    user = new User({
+      pat: CLARIFAI_PAT,
+      userId: CREATE_APP_USER_ID,
+      appId: MAIN_APP_ID,
+    });
+    try {
+      const appObject = await user.createApp({
+        appId: CREATE_APP_ID,
+        baseWorkflow: "Empty",
+      });
+      app = new App({
+        authConfig: {
+          pat: CLARIFAI_PAT,
+          userId: CREATE_APP_USER_ID,
+          appId: appObject.id,
+        },
+      });
+    } catch (e) {
+      if ((e as { message: string }).message.includes("already exists")) {
+        app = new App({
+          authConfig: {
+            pat: CLARIFAI_PAT,
+            userId: CREATE_APP_USER_ID,
+            appId: CREATE_APP_ID,
+          },
+        });
+      }
+      throw e;
+    }
+  });
+
+  it(
+    "should create workflow",
+    {
+      timeout: 20000,
+    },
+    async () => {
+      for (let i = 0; i < workflowFixtureFiles.length; i++) {
+        const file = workflowFixtureFiles[i];
+        console.log("Testing file: ", file);
+        // TODO: remove this condition once the test case failure in custom_cropper models are fixed
+        if (file.includes("custom_cropper")) continue;
+        const generateNewId = file.endsWith("general.yml") ? false : true;
+        const workflow = await app.createWorkflow({
+          configFilePath: file,
+          generateNewId,
+        });
+        expect(workflow.id).toBeDefined();
+      }
+    },
+  );
+
+  afterAll(async () => {
+    await user.deleteApp({ appId: CREATE_APP_ID });
+  });
+});